ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/Frodo4/Src/main.h

Comparing Frodo4/Src/main.h (file contents):
Revision 1.1 by cebix, 2003-07-01T17:09:43Z vs.
Revision 1.10 by cebix, 2010-04-21T22:03:44Z

#	Line 1 | Line 1
1		/*
2		*  main.h - Main program
3		*
4	<	*  Frodo (C) 1994-1997,2002 Christian Bauer
4	>	*  Frodo Copyright (C) Christian Bauer
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	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 126 | Line 124 | class Frodo {
124		public:
125		Frodo();
126		void ArgvReceived(int argc, char **argv);
127	<	void ReadyToRun(void);
128	<	static Prefs *reload_prefs(void);
127	>	void ReadyToRun();
128	>	bool RunPrefsEditor();
129
130	<	C64 *TheC64;
130	>	static const char *get_prefs_path() { return prefs_path; }
131
132		private:
133	<	bool load_rom_files(void);
133	>	void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
134	>	void load_rom_files();
135
136		static char prefs_path[256];    // Pathname of current preferences file
137		};
138
139	+	extern Frodo *TheApp;  // Pointer to Frodo object
140	+
141		#endif
142
143
#	Line 151 | Line 152 | public:
152		Frodo();
153
154		void Run(void);
154	–	C64 *TheC64;
155
156		private:
157	<	bool load_rom_files(void);
157	>	void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
158	>	void load_rom_files();
159		};
160
161		#endif
#	Line 174 | Line 175 | public:
175		void ReadyToRun();
176		void RunPrefsEditor();
177
177	–	C64 *TheC64;
178		char prefs_path[256];   // Pathname of current preferences file
179
180		private:
181	<	bool load_rom_files();
181	>	void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
182	>	void load_rom_files();
183		};
184
185		// Global variables
#	Line 190 | Line 191 | extern HWND hwnd;
191		// Command line options.
192		extern BOOL full_screen;
193
193	–	#if defined(DEBUG)
194	–
195	–	inline void Debug(const char *format, ...)
196	–	{
197	–	va_list args;
198	–	va_start(args, format);
199	–	char tmp[256];
200	–	vsprintf(tmp, format, args);
201	–	va_end(args);
202	–	OutputDebugString(tmp);
203	–	}
204	–
205	–	#else
206	–
207	–	inline void Debug(const char *format, ...)
208	–	{
209	–	}
210	–
211	–	#endif
212	–
213	–	#define DebugResult(message, val) \
214	–	Debug("%s: 0x%x (%d)\n", message, val, HRESULT_CODE(val))
215	–
194		#endif
195
196
#	Line 224 | Line 202 | inline void Debug(const char *format, ..
202
203		class Frodo
204		{
205	<	public:
206	<	Frodo(void);
207	<	~Frodo(void);
208	<	void ReadyToRun(void);
231	<
232	<	C64 *TheC64;
205	>	public:
206	>	Frodo();
207	>	~Frodo();
208	>	void ReadyToRun(void);
209
210	<	private:
211	<	bool load_rom_files(void);
210	>	private:
211	>	void load_rom(const char *which, const char *path, uint8 *where, size_t size, const uint8 *builtin);
212	>	void load_rom_files();
213		};
214
215		#endif
216
217	+	// Global C64 object
218	+	extern C64 *TheC64;
219	+
220
221		/*
222	<	*  PSX specific stuff
222	>	*  Functions
223		*/
224
225	<	#ifdef __PSXOS__
226	<
247	<	class Frodo {
248	<	public:
249	<	Frodo();
250	<	void ReadyToRun(void);
251	<
252	<	C64 *TheC64;
253	<
254	<	private:
255	<	bool load_rom_files(void);
256	<
257	<	char prefs_path[256];   // Pathname of current preferences file
258	<	};
259	<
260	<	// Global variables
261	<	extern Frodo *be_app;   // Pointer to Frodo object
262	<
263	<	#endif
225	>	// Determine whether path name refers to a directory
226	>	extern bool IsDirectory(const char *path);
227
228		#endif

Diff Legend

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