ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/Frodo4/Src/main.h
(Generate patch)

Comparing Frodo4/Src/main.h (file contents):
Revision 1.3 by cebix, 2003-07-01T17:51:17Z vs.
Revision 1.5 by cebix, 2004-01-11T14:03:29Z

# Line 71 | Line 71 | public:
71          virtual bool QuitRequested(void);
72          virtual void AboutRequested(void);
73  
74 –        C64 *TheC64;
75 –
74   private:
75 <        bool load_rom_files(void);
75 >        void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
76 >        void load_rom_files();
77  
78          char prefs_path[1024];  // Pathname of current preferences file
79          bool prefs_showing;             // true: Preferences editor is on screen
# Line 100 | Line 99 | public:
99          void ReadyToRun(void);
100          void RunPrefsEditor(void);
101  
103 –        C64 *TheC64;
104 –
102   private:
103 <        bool load_rom_files(void);
103 >        void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
104 >        void load_rom_files();
105  
106          char prefs_path[256];   // Pathname of current preferences file
107   };
# Line 129 | Line 127 | public:
127          void ReadyToRun(void);
128          static Prefs *reload_prefs(void);
129  
132 –        C64 *TheC64;
133 –
130   private:
131 <        bool load_rom_files(void);
131 >        void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
132 >        void load_rom_files();
133  
134          static char prefs_path[256];    // Pathname of current preferences file
135   };
# Line 151 | Line 148 | public:
148          Frodo();
149  
150          void Run(void);
154 –        C64 *TheC64;
151  
152   private:
153 <        bool load_rom_files(void);
153 >        void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
154 >        void load_rom_files();
155   };
156  
157   #endif
# Line 174 | Line 171 | public:
171          void ReadyToRun();
172          void RunPrefsEditor();
173  
177 –        C64 *TheC64;
174          char prefs_path[256];   // Pathname of current preferences file
175  
176   private:
177 <        bool load_rom_files();
177 >        void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
178 >        void load_rom_files();
179   };
180  
181   // Global variables
# Line 224 | Line 221 | inline void Debug(const char *format, ..
221  
222   class Frodo
223   {
224 <  public:
225 <  Frodo(void);
226 <  ~Frodo(void);
227 <  void ReadyToRun(void);
231 <
232 <  C64 *TheC64;
224 > public:
225 >        Frodo();
226 >        ~Frodo();
227 >        void ReadyToRun(void);
228  
229 <  private:
230 <  bool load_rom_files(void);
229 > private:
230 >        void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
231 >        void load_rom_files();
232   };
233  
234   #endif
235  
236 + // Global C64 object
237 + extern C64 *TheC64;
238 +
239  
240   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines