[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src scumm_globals.cpp,1.8,1.8.2.1 scumm_globals.h,1.13,1.13.2.1
Chris Apers
chrilith at users.sourceforge.net
Mon Dec 20 10:55:04 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/builder b_globals.c,1.4,1.4.2.1 b_globals.h,1.5,1.5.2.1 enum_globals.h,1.6,1.6.2.1
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src globals.h,1.14,1.14.2.1 init_arm.cpp,1.2,1.2.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25642
Modified Files:
Tag: branch-0-7-0
scumm_globals.cpp scumm_globals.h
Log Message:
Cleanup
Index: scumm_globals.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/scumm_globals.cpp,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- scumm_globals.cpp 9 Nov 2004 10:57:22 -0000 1.8
+++ scumm_globals.cpp 20 Dec 2004 18:53:54 -0000 1.8.2.1
@@ -29,8 +29,8 @@
if (gVars->globals[GBVARS_COMMON]) {
CALL_INIT(ScummFont)
}
+ if (gVars->globals[GBVARS_ENGINE]) {
#ifndef DISABLE_SCUMM
- if (gVars->globals[GBVARS_SCUMM]) {
CALL_INIT(DimuseTables)
CALL_INIT(Akos)
CALL_INIT(DimuseCodecs)
@@ -40,36 +40,31 @@
CALL_INIT(Charset)
CALL_INIT(Costume)
CALL_INIT(PlayerV2)
- }
#endif
#ifndef DISABLE_SIMON
- if (gVars->globals[GBVARS_SIMON]) {
CALL_INIT(Simon_Simon)
+ CALL_INIT(Simon_Cursor)
CALL_INIT(Simon_Charset)
- }
#endif
#ifndef DISABLE_SWORD1
- if (gVars->globals[GBVARS_SWORD1]) {
CALL_INIT(Sword1_fxList)
- }
#endif
#ifndef DISABLE_QUEEN
- if (gVars->globals[GBVARS_QUEEN]) {
CALL_INIT(Queen_Talk)
CALL_INIT(Queen_Display)
CALL_INIT(Queen_Graphics)
CALL_INIT(Queen_Restables)
CALL_INIT(Queen_Musicdata)
- }
#endif
+ }
}
static void GlbReleaseAll() {
if (gVars->globals[GBVARS_COMMON]) {
CALL_RELEASE(ScummFont)
}
-#ifndef DISABLE_SCUMM
if (gVars->globals[GBVARS_SCUMM]) {
+#ifndef DISABLE_SCUMM
CALL_RELEASE(DimuseTables)
CALL_RELEASE(Akos)
CALL_RELEASE(DimuseCodecs)
@@ -79,28 +74,23 @@
CALL_RELEASE(Charset)
CALL_RELEASE(Costume)
CALL_RELEASE(PlayerV2)
- }
#endif
#ifndef DISABLE_SIMON
- if (gVars->globals[GBVARS_SIMON]) {
CALL_RELEASE(Simon_Simon)
+ CALL_RELEASE(Simon_Cursor)
CALL_RELEASE(Simon_Charset)
- }
#endif
#ifndef DISABLE_SWORD1
- if (gVars->globals[GBVARS_SWORD1]) {
CALL_RELEASE(Sword1_fxList)
- }
#endif
#ifndef DISABLE_QUEEN
- if (gVars->globals[GBVARS_QUEEN]) {
CALL_RELEASE(Queen_Talk)
CALL_RELEASE(Queen_Display)
CALL_RELEASE(Queen_Graphics)
CALL_RELEASE(Queen_Restables)
CALL_RELEASE(Queen_Musicdata)
- }
#endif
+ }
}
//TODO : use Boolean instead of void to check err
@@ -118,11 +108,7 @@
void GlbOpen() {
gVars->globals[GBVARS_COMMON]= GlbOpenInternal("Glbs::Common");
- gVars->globals[GBVARS_SCUMM] = GlbOpenInternal("Glbs::Scumm");
- gVars->globals[GBVARS_SWORD1]= GlbOpenInternal("Glbs::Sword1");
- gVars->globals[GBVARS_SIMON] = GlbOpenInternal("Glbs::Simon");
- gVars->globals[GBVARS_QUEEN] = GlbOpenInternal("Glbs::Queen");
-
+ gVars->globals[GBVARS_SCUMM] = GlbOpenInternal("Glbs::Engine");
GlbInitAll();
}
@@ -131,14 +117,8 @@
if (gVars->globals[GBVARS_COMMON])
DmCloseDatabase(gVars->globals[GBVARS_COMMON]);
- if (gVars->globals[GBVARS_SCUMM])
- DmCloseDatabase(gVars->globals[GBVARS_SCUMM]);
- if (gVars->globals[GBVARS_SIMON])
- DmCloseDatabase(gVars->globals[GBVARS_SIMON]);
- if (gVars->globals[GBVARS_SWORD1])
- DmCloseDatabase(gVars->globals[GBVARS_SWORD1]);
- if (gVars->globals[GBVARS_QUEEN])
- DmCloseDatabase(gVars->globals[GBVARS_QUEEN]);
+ if (gVars->globals[GBVARS_ENGINE])
+ DmCloseDatabase(gVars->globals[GBVARS_ENGINE]);
}
void *GlbGetRecord(UInt16 index, UInt16 id) {
Index: scumm_globals.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/scumm_globals.h,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- scumm_globals.h 9 Nov 2004 10:57:22 -0000 1.13
+++ scumm_globals.h 20 Dec 2004 18:53:55 -0000 1.13.2.1
@@ -64,6 +64,7 @@
// Simon stuffs
#ifndef DISABLE_SIMON
PROTO_GLOBALS(Simon_Simon)
+PROTO_GLOBALS(Simon_Cursor)
PROTO_GLOBALS(Simon_Charset)
#endif
// Queen stuffs
@@ -74,7 +75,6 @@
PROTO_GLOBALS(Queen_Restables)
PROTO_GLOBALS(Queen_Musicdata)
#endif
-
// Sword1 stuffs
#ifndef DISABLE_SWORD1
PROTO_GLOBALS(Sword1_fxList)
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src/builder b_globals.c,1.4,1.4.2.1 b_globals.h,1.5,1.5.2.1 enum_globals.h,1.6,1.6.2.1
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src globals.h,1.14,1.14.2.1 init_arm.cpp,1.2,1.2.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list