[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.46,1.47 dialogs.cpp,1.43,1.44

Chris Apers chrilith at users.sourceforge.net
Mon May 5 05:30:06 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv15285

Modified Files:
	akos.cpp dialogs.cpp 
Log Message:
Add more ScummVM globals to PDB

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- akos.cpp	28 Mar 2003 23:08:35 -0000	1.46
+++ akos.cpp	5 May 2003 12:29:26 -0000	1.47
@@ -524,6 +524,9 @@
 	} while (1);
 }
 
+#ifdef __PALM_OS__
+const byte *default_scale_table;
+#else
 const byte default_scale_table[768] = {
 	0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
 	0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
@@ -624,6 +627,7 @@
 	0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
 	0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF,
 };
+#endif
 
 void AkosRenderer::codec1() {
 	int num_colors;
@@ -1378,6 +1382,7 @@
 			case AKC_SkipG:
 			case AKC_SkipLE:
 			case AKC_SkipL:
+
 			case AKC_SkipNE:
 			case AKC_SkipE:
 				curpos += 5;
@@ -1650,3 +1655,13 @@
 		return a >= b;
 	}
 }
+
+#ifdef __PALM_OS__
+#include "scumm_globals.h" // init globals
+void Akos_initGlobals()		{	
+	GSETPTR(default_scale_table, GBVARS_DEFAULTSCALETABLE_INDEX, byte, GBVARS_SCUMM)
+}
+void Akos_releaseGlobals()	{
+	GRELEASEPTR(GBVARS_DEFAULTSCALETABLE_INDEX, GBVARS_SCUMM)
+}
+#endif

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- dialogs.cpp	30 Apr 2003 13:23:26 -0000	1.43
+++ dialogs.cpp	5 May 2003 12:29:26 -0000	1.44
@@ -81,6 +81,11 @@
 	"Please select an action"							//27
 };
 
+#ifdef __PALM_OS__
+static ResString *string_map_table_v7;
+static ResString *string_map_table_v6;
+static ResString *string_map_table_v5;
+#else
 static ResString string_map_table_v7[] = {
 	{96, "game name and version"}, //that's how it's supposed to be
 	{77, "Select a game to LOAD"},
@@ -153,7 +158,7 @@
 	{12, "Ok"},
 	{4, "Game paused"}
 };
-
+#endif
 
 #pragma mark -
 
@@ -757,4 +762,18 @@
 	}
 }
 
+#endif
+
+#ifdef __PALM_OS__
+#include "scumm_globals.h" // init globals
+void Dialogs_initGlobals()		{
+	GSETPTR(string_map_table_v7, GBVARS_STRINGMAPTABLEV7_INDEX, ResString, GBVARS_SCUMM)
+	GSETPTR(string_map_table_v6, GBVARS_STRINGMAPTABLEV6_INDEX, ResString, GBVARS_SCUMM)
+	GSETPTR(string_map_table_v5, GBVARS_STRINGMAPTABLEV5_INDEX, ResString, GBVARS_SCUMM)
+}
+void Dialogs_releaseGlobals()	{
+	GRELEASEPTR(GBVARS_STRINGMAPTABLEV7_INDEX, GBVARS_SCUMM)
+	GRELEASEPTR(GBVARS_STRINGMAPTABLEV6_INDEX, GBVARS_SCUMM)
+	GRELEASEPTR(GBVARS_STRINGMAPTABLEV5_INDEX, GBVARS_SCUMM)
+}
 #endif





More information about the Scummvm-git-logs mailing list