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

[Chris Apers]

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

Modified Files:
	scumm_globals.h 
Log Message:
Moved to another file, now used by ScummVM and Builder

Index: scumm_globals.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/scumm_globals.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- scumm_globals.h	3 Nov 2003 16:09:12 -0000	1.8
+++ scumm_globals.h	28 Nov 2003 09:33:11 -0000	1.9
@@ -23,59 +23,13 @@
 #ifndef __SCUMM_GLOBALS_H__
 #define __SCUMM_GLOBALS_H__
 
-enum {
-	GBVARS_DIGSTATEMUSICMAP_INDEX = 0,
-	GBVARS_DIGSTATEMUSICTABLE_INDEX,
-	GBVARS_COMISTATEMUSICTABLE_INDEX,
-	GBVARS_COMISEQMUSICTABLE_INDEX,
-	GBVARS_DIGSEQMUSICTABLE_INDEX,
-	GBVARS_FTSTATEMUSICTABLE_INDEX,
-	GBVARS_FTSEQMUSICTABLE_INDEX,
-	GBVARS_GUIFONT_INDEX,
-	GBVARS_DEFAULTSCALETABLE_INDEX,
-	GBVARS_IMCTABLE_INDEX,
-	GBVARS_CODEC47TABLE_INDEX,
-	GBVARS_TRANSITIONEFFECTS_INDEX,
-	GBVARS_STRINGMAPTABLEV7_INDEX,
-	GBVARS_STRINGMAPTABLEV6_INDEX,
-	GBVARS_STRINGMAPTABLEV5_INDEX,
-	GBVARS_GERMANCHARSETDATAV2_INDEX,
-	GBVARS_FRENCHCHARSETDATAV2_INDEX,
-	GBVARS_ENGLISHCHARSETDATAV2_INDEX,
-	GBVARS_ITALIANCHARSETDATAV2_INDEX,
-	GBVARS_SPANISHCHARSETDATAV2_INDEX,
-	GBVARS_COSTSCALETABLE_INDEX,
-	GBVARS_NOTELENGTHS_INDEX,
-	GBVARS_HULLOFFSETS_INDEX,
-	GBVARS_HULLS_INDEX,
-	GBVARS_FREQMODLENGTHS_INDEX,
-	GBVARS_FREQMODOFFSETS_INDEX,
-	GBVARS_FREQMODTABLE_INDEX,
-	GBVARS_SPKFREQTABLE_INDEX,
-	GBVARS_PCJRFREQTABLE_INDEX
-};
-
-enum {
-	GBVARS_RESOURCETABLEPE100V1_INDEX = 0,
-	GBVARS_RESOURCETABLEPE100V2_INDEX,
-	GBVARS_RESOURCETABLEPM10_INDEX,
-	GBVARS_RESOURCETABLECM10_INDEX
-};
+#include "builder/enum_globals.h"
 
 void *GlbGetRecord(UInt16 index, UInt16 id);
 void GlbReleaseRecord(UInt16 index, UInt16 id);
 void GlbOpen();
 void GlbClose();
 
-enum {
-	GBVARS_SCUMM = 0,
-	GBVARS_SIMON,
-	GBVARS_SKY,
-	GBVARS_SWORD2,
-	GBVARS_QUEEN,
-	
-	GBVARS_COUNT
-};
 
 #define _GINIT(x) void initGlobals_##x() {
 #define _GEND }
@@ -103,8 +57,13 @@
 PROTO_GLOBALS(PlayerV2)
 #endif
 
+#ifndef DISABLE_SIMON
+PROTO_GLOBALS(Simon_Simon)
+PROTO_GLOBALS(Simon_Charset)
+#endif
+
 #ifndef DISABLE_QUEEN
-PROTO_GLOBALS(Restables)
+PROTO_GLOBALS(Queen_Restables)
 #endif
 
 #undef PROTO_GLOBALS