[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.70,1.71 gfx.cpp,1.97,1.98 resource.cpp,1.91,1.92

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv30644

Modified Files:
	gameDetector.cpp gfx.cpp resource.cpp 
Log Message:
Start of (non-functional) Simon2dos support.
Implement the holy (sic) cursor.



Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- gameDetector.cpp	27 Jun 2002 10:40:36 -0000	1.70
+++ gameDetector.cpp	29 Jun 2002 10:28:43 -0000	1.71
@@ -411,6 +411,8 @@
 	{"moondemo", "Putt Putt goes to the moon (demo)", GID_SAMNMAX, 6, 3, 0,
 	 GF_NEW_OPCODES | GF_AFTER_V6 | GF_USE_KEY  | GF_ADLIB_DEFAULT | GF_HUMONGOUS},
 
+	{"test", "Test demo game", GID_SAMNMAX, 6, 6, 6, GF_NEW_OPCODES | GF_AFTER_V6},
+
 	/* Scumm Version 7 */
 	{"ft", "Full Throttle", GID_FT, 7, 3, 0,
 	 GF_NEW_OPCODES | GF_AFTER_V6 | GF_AFTER_V7},
@@ -419,7 +421,8 @@
 
 	/* Simon the Sorcerer 1 & 2 (not SCUMM games) */
 	{"simon1dos", "Simon the Sorcerer 1 for DOS", GID_SIMON_FIRST+0, 99, 99, 99, 0},
-	{"simon1win", "Simon the Sorcerer 1 for Windows", GID_SIMON_FIRST+2, 99, 99, 99, 0},
+	{"simon2dos", "Simon the Sorcerer 2 for Dos", GID_SIMON_FIRST+1, 99, 99, 99, 0},
+	{"simon1win", "Simon the Sorcerer 1 for Windows", GID_SIMON_FIRST+2, 99, 99, 99, 0},	
 	{"simon2win", "Simon the Sorcerer 2 for Windows", GID_SIMON_FIRST+3, 99, 99, 99, 0},
 
 	/* Scumm Version 8 */

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- gfx.cpp	27 Jun 2002 14:10:56 -0000	1.97
+++ gfx.cpp	29 Jun 2002 10:28:43 -0000	1.98
@@ -2511,8 +2511,10 @@
 	color = default_cursor_colors[idx];
 
 	for (i = 0; i < 16; i++) {
-		_grabbedCursor[16 * 8 + i] = color;
-		_grabbedCursor[16 * i + 8] = color;
+		if ((i<7) || (i>9)) {
+			_grabbedCursor[16 * 8 + i] = color;
+			_grabbedCursor[16 * i + 8] = color;
+		}
 	}
 
 	updateCursor();

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- resource.cpp	27 Jun 2002 10:40:36 -0000	1.91
+++ resource.cpp	29 Jun 2002 10:28:43 -0000	1.92
@@ -1167,8 +1167,10 @@
 		_shadowPaletteSize = NUM_SHADOW_PALETTE * 256;
 	} else if (_features & GF_AFTER_V6) {
 		_numVariables = fileReadWordLE();
+		printf("Read word numvariables as %d\n", _numVariables);
 		fileReadWordLE();
 		_numBitVariables = fileReadWordLE();
+		printf("Read word numbitvariables as %d\n", _numBitVariables);
 		_numLocalObjects = fileReadWordLE();
 		_numArray = fileReadWordLE();
 		fileReadWordLE();