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

[Chris Apers]

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

Modified Files:
	scumm_globals.cpp scumm_globals.h 
Log Message:
Updated with lastest CVS changes

Index: scumm_globals.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/scumm_globals.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- scumm_globals.cpp	6 Jan 2004 12:45:25 -0000	1.5
+++ scumm_globals.cpp	20 Jan 2004 14:18:08 -0000	1.6
@@ -25,15 +25,16 @@
 #include "globals.h"
 #include "scumm_globals.h"
 
+#include "stdafx.h"
 #include "scumm.h"
 
 static void GlbInitAll() {
 #ifndef DISABLE_SCUMM
 	if (gVars->globals[GBVARS_SCUMM]) {
-		CALL_INIT(IMuseDigital)
+		CALL_INIT(DimuseTables)
 		CALL_INIT(NewGui)
 		CALL_INIT(Akos)
-		CALL_INIT(Bundle)
+		CALL_INIT(DimuseCodecs)
 		CALL_INIT(Codec47)
 		CALL_INIT(Gfx)
 		CALL_INIT(Dialogs)
@@ -49,19 +50,19 @@
 	}
 #endif
 #ifndef DISABLE_QUEEN
-	if (gVars->globals[GBVARS_QUEEN]) {
-		CALL_INIT(Queen_Restables)
-	}
+//	if (gVars->globals[GBVARS_QUEEN]) {
+//		CALL_INIT(Queen_Restables)
+//	}
 #endif
 }
 
 static void GlbReleaseAll() {
 #ifndef DISABLE_SCUMM
 	if (gVars->globals[GBVARS_SCUMM]) {
-		CALL_RELEASE(IMuseDigital)
+		CALL_RELEASE(DimuseTables)
 		CALL_RELEASE(NewGui)
 		CALL_RELEASE(Akos)
-		CALL_RELEASE(Bundle)
+		CALL_RELEASE(DimuseCodecs)
 		CALL_RELEASE(Codec47)
 		CALL_RELEASE(Gfx)
 		CALL_RELEASE(Dialogs)
@@ -77,9 +78,9 @@
 	}
 #endif
 #ifndef DISABLE_QUEEN
-	if (gVars->globals[GBVARS_QUEEN]) {
-		CALL_RELEASE(Queen_Restables)
-	}
+//	if (gVars->globals[GBVARS_QUEEN]) {
+//		CALL_RELEASE(Queen_Restables)
+//	}
 #endif
 }
 

Index: scumm_globals.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/scumm_globals.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- scumm_globals.h	6 Jan 2004 12:45:25 -0000	1.10
+++ scumm_globals.h	20 Jan 2004 14:18:08 -0000	1.11
@@ -45,10 +45,10 @@
 								void CALL_RELEASE(x);
 
 #ifndef DISABLE_SCUMM
-PROTO_GLOBALS(IMuseDigital)
+PROTO_GLOBALS(DimuseTables)
 PROTO_GLOBALS(NewGui)
 PROTO_GLOBALS(Akos)
-PROTO_GLOBALS(Bundle)
+PROTO_GLOBALS(DimuseCodecs)
 PROTO_GLOBALS(Codec47)
 PROTO_GLOBALS(Gfx)
 PROTO_GLOBALS(Dialogs)