[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src scumm_globals.cpp,1.7,1.8 scumm_globals.h,1.12,1.13

Chris Apers chrilith at users.sourceforge.net
Tue Nov 9 02:58:05 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4146

Modified Files:
	scumm_globals.cpp scumm_globals.h 
Log Message:
Added Sword1 support

Index: scumm_globals.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/scumm_globals.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- scumm_globals.cpp	25 May 2004 13:20:22 -0000	1.7
+++ scumm_globals.cpp	9 Nov 2004 10:57:22 -0000	1.8
@@ -21,13 +21,10 @@
  */
 #include <PalmOS.h>
 
-#include "start.h"
+#include "palmdefs.h"
 #include "globals.h"
 #include "scumm_globals.h"
 
-#include "stdafx.h"
-#include "scumm.h"
-
 static void GlbInitAll() {
 	if (gVars->globals[GBVARS_COMMON]) {
 		CALL_INIT(ScummFont)
@@ -51,6 +48,11 @@
 		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)
@@ -85,6 +87,11 @@
 		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)
@@ -112,6 +119,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");
 
@@ -127,6 +135,8 @@
 		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]);
 }

Index: scumm_globals.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/scumm_globals.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- scumm_globals.h	25 May 2004 13:20:22 -0000	1.12
+++ scumm_globals.h	9 Nov 2004 10:57:22 -0000	1.13
@@ -75,6 +75,11 @@
 PROTO_GLOBALS(Queen_Musicdata)
 #endif
 
+// Sword1 stuffs
+#ifndef DISABLE_SWORD1
+PROTO_GLOBALS(Sword1_fxList)
+#endif
+
 #undef PROTO_GLOBALS
 
 #endif





More information about the Scummvm-git-logs mailing list