[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src scumm_globals.h,1.5,1.6

Chris Apers chrilith at users.sourceforge.net
Mon Aug 18 04:12:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1:/tmp/cvs-serv2554

Modified Files:
	scumm_globals.h 
Log Message:
Updated globals access for PalmOS

Index: scumm_globals.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/scumm_globals.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- scumm_globals.h	7 Jul 2003 08:49:27 -0000	1.5
+++ scumm_globals.h	18 Aug 2003 10:59:21 -0000	1.6
@@ -29,7 +29,7 @@
 #define GBVARS_FTSEQMUSICTABLE_INDEX		6
 #define GBVARS_GUIFONT_INDEX				7
 #define GBVARS_DEFAULTSCALETABLE_INDEX 		8
-#define GBVARS_CODEC37TABLE_INDEX			9
+#define GBVARS_IMCTABLE_INDEX				9
 #define GBVARS_CODEC47TABLE_INDEX			10
 #define GBVARS_TRANSITIONEFFECTS_INDEX		11
 #define GBVARS_STRINGMAPTABLEV7_INDEX		12
@@ -40,34 +40,37 @@
 #define GBVARS_ENGLISHCHARSETDATAV2_INDEX	17
 #define GBVARS_ITALIANCHARSETDATAV2_INDEX	18
 #define GBVARS_SPANISHCHARSETDATAV2_INDEX	19
+#define GBVARS_COSTSCALETABLE_INDEX			20
 
 #define GBVARS_SCUMM	0
 #define GBVARS_SIMON	1
 #define GBVARS_SKY		2
+#define GBVARS_SWORD2	3
 
-#define GSETPTR(var,index,format,id)	var = (format *)GBGetRecord(index,id);
-#define GRELEASEPTR(index,id)			GBReleaseRecord(index,id);
-
-void *GBGetRecord(UInt16 index, UInt16 id);
-void GBReleaseRecord(UInt16 index, UInt16 id);
-
-void IMuseDigital_initGlobals();
-void IMuseDigital_releaseGlobals();
+#define _GINIT(x) void initGlobals_##x() {
+#define _GEND }
+#define _GRELEASE(x) void releaseGlobals_##x() {
 
-void NewGui_initGlobals();
-void NewGui_releaseGlobals();
+#define CALL_INIT(x) initGlobals_##x();
+#define CALL_RELEASE(x)	releaseGlobals_##x();
 
-void Codec47_initGlobals();
-void Codec47_releaseGlobals();
+#define _GSETPTR(var,index,format,id)	var = (format *)GBGetRecord(index,id);
+#define _GRELEASEPTR(index,id)			GBReleaseRecord(index,id);
 
-void Gfx_initGlobals();
-void Gfx_releaseGlobals();
+void *GBGetRecord(UInt16 index, UInt16 id);
+void GBReleaseRecord(UInt16 index, UInt16 id);
 
-void Akos_initGlobals();
-void Akos_releaseGlobals();
+#define PROTO_GLOBALS(x)		void CALL_INIT(x);\
+								void CALL_RELEASE(x);
 
-void Dialogs_initGlobals();
-void Dialogs_releaseGlobals();
+PROTO_GLOBALS(IMuseDigital)
+PROTO_GLOBALS(NewGui)
+PROTO_GLOBALS(Akos)
+PROTO_GLOBALS(Bundle)
+PROTO_GLOBALS(Codec47)
+PROTO_GLOBALS(Gfx)
+PROTO_GLOBALS(Dialogs)
+PROTO_GLOBALS(Charset)
+PROTO_GLOBALS(Costume)
 
-void Charset_initGlobals();
-void Charset_releaseGlobals();
+#undef PROTO_GLOBALS
\ No newline at end of file





More information about the Scummvm-git-logs mailing list