[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.350,1.351

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv23934/simon

Modified Files:
	simon.cpp 
Log Message:
Added memory auto-configuration on PalmOS for better speed and compatibility

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -d -r1.350 -r1.351
--- simon.cpp	2 Dec 2003 08:43:54 -0000	1.350
+++ simon.cpp	2 Dec 2003 11:17:21 -0000	1.351
@@ -38,15 +38,17 @@
 #include <errno.h>
 #include <time.h>
 
-extern uint16 _debugLevel;
+#ifdef __PALM_OS__
+#include "globals.h"
+#endif
 
 #ifdef _WIN32_WCE
-
 extern bool toolbar_drawn;
 extern bool draw_keyboard;
-
 #endif
 
+extern uint16 _debugLevel;
+
 static const GameSettings simon_settings[] = {
 	// Simon the Sorcerer 1 & 2 (not SCUMM games)
 	{"simon1acorn", "Simon the Sorcerer 1 (Acorn)", MDT_ADLIB | MDT_NATIVE, GAME_SIMON1ACORN, "DATA"},
@@ -201,7 +203,11 @@
 		TABLE_INDEX_BASE = 1580 / 4;
 		TEXT_INDEX_BASE = 1500 / 4;
 		NUM_VIDEO_OP_CODES = 75;
+#ifndef __PALM_OS__
 		VGA_MEM_SIZE = 2000000;
+#else
+		VGA_MEM_SIZE = gVars->memory[kMemSimon2Games];
+#endif
 		TABLES_MEM_SIZE = 100000;
 		MUSIC_INDEX_BASE = 1128 / 4;
 		SOUND_INDEX_BASE = 1660 / 4;
@@ -210,7 +216,11 @@
 		TABLE_INDEX_BASE = 1576 / 4;
 		TEXT_INDEX_BASE = 1460 / 4;
 		NUM_VIDEO_OP_CODES = 64;
+#ifndef __PALM_OS__
 		VGA_MEM_SIZE = 1000000;
+#else
+		VGA_MEM_SIZE = gVars->memory[kMemSimon1Games];
+#endif
 		TABLES_MEM_SIZE = 50000;
 		MUSIC_INDEX_BASE = 1316 / 4;
 		SOUND_INDEX_BASE = 0;