--- Frodo4/Src/main.h	2003/07/01 17:09:43	1.1
+++ Frodo4/Src/main.h	2003/07/02 14:46:24	1.4
@@ -1,7 +1,7 @@
 /*
  *  main.h - Main program
  *
- *  Frodo (C) 1994-1997,2002 Christian Bauer
+ *  Frodo (C) 1994-1997,2002-2003 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -74,7 +74,8 @@ public:
 	C64 *TheC64;
 
 private:
-	bool load_rom_files(void);
+	void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
+	void load_rom_files();
 
 	char prefs_path[1024];	// Pathname of current preferences file
 	bool prefs_showing;		// true: Preferences editor is on screen
@@ -103,7 +104,8 @@ public:
 	C64 *TheC64;
 
 private:
-	bool load_rom_files(void);
+	void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
+	void load_rom_files();
 
 	char prefs_path[256];	// Pathname of current preferences file
 };
@@ -132,7 +134,8 @@ public:
 	C64 *TheC64;
 
 private:
-	bool load_rom_files(void);
+	void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
+	void load_rom_files();
 
 	static char prefs_path[256];	// Pathname of current preferences file
 };
@@ -154,7 +157,8 @@ public:
 	C64 *TheC64;
 
 private:
-	bool load_rom_files(void);
+	void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
+	void load_rom_files();
 };
 
 #endif
@@ -178,7 +182,8 @@ public:
 	char prefs_path[256];	// Pathname of current preferences file
 
 private:
-	bool load_rom_files();
+	void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
+	void load_rom_files();
 };
 
 // Global variables
@@ -224,42 +229,19 @@ inline void Debug(const char *format, ..
 
 class Frodo
 {
-  public:
-  Frodo(void);
-  ~Frodo(void);
-  void ReadyToRun(void);
-
-  C64 *TheC64;
-
-  private:
-  bool load_rom_files(void);
-};
-
-#endif
-
-
-/*
- *  PSX specific stuff
- */
-
-#ifdef __PSXOS__
-
-class Frodo {
 public:
 	Frodo();
+	~Frodo();
 	void ReadyToRun(void);
 
 	C64 *TheC64;
 
 private:
-	bool load_rom_files(void);
-
-	char prefs_path[256];	// Pathname of current preferences file
+	void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
+	void load_rom_files();
 };
 
-// Global variables
-extern Frodo *be_app;	// Pointer to Frodo object
-
 #endif
 
+
 #endif