[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.336,1.337

Chris Apers chrilith at users.sourceforge.net
Fri Nov 28 02:12:06 CET 2003


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

Modified Files:
	simon.cpp 
Log Message:
Can't do this like that

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -d -r1.336 -r1.337
--- simon.cpp	13 Nov 2003 00:00:49 -0000	1.336
+++ simon.cpp	28 Nov 2003 10:11:56 -0000	1.337
@@ -1913,6 +1913,7 @@
 	for (;;) {
 		_last_hitarea = NULL;
 		_last_hitarea_3 = NULL;
+
 		for (;;) {
 			if (_key_pressed == 35)
 				f10_key();
@@ -1922,7 +1923,7 @@
 			if (_last_hitarea_3 != 0)
 				break;
 			hitarea_stuff_helper();
-			delay(100);
+			delay(100);	
 		}
 
 		ha = _last_hitarea;
@@ -3511,7 +3512,6 @@
 
 #ifdef __PALM_OS__
 static const byte *_simon1_cursor;
-static const byte **_simon2_cursors;
 #else
 static const byte _simon1_cursor[256] = {
 	0xe1,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
@@ -3531,6 +3531,7 @@
 	0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
 	0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
 };
+#endif
 
 static const byte _simon2_cursors[10][256] = {
 	// cross hair
@@ -3704,7 +3705,6 @@
 	  0xff,0xff,0xff,0xff,0xff,0xe5,0xe8,0xe9,0xe8,0xe5,0xff,0xff,0xff,0xff,0xff,0xff,
 	  0xff,0xff,0xff,0xff,0xff,0xff,0xe5,0xe5,0xe5,0xff,0xff,0xff,0xff,0xff,0xff,0xff },
 };
-#endif
 
 void SimonEngine::draw_mouse_pointer() {
 	if (_game & GF_SIMON2)
@@ -4808,7 +4808,7 @@
 				break;
 			case OSystem::EVENT_LBUTTONDOWN:
 				_left_button_down++;
-#ifdef _WIN32_WCE
+#if defined (_WIN32_WCE) || defined(__PALM_OS__)
 				_sdl_mouse_x = event.mouse.x;
 				_sdl_mouse_y = event.mouse.y;
 #endif
@@ -5159,7 +5159,6 @@
 _GSETPTR(Simon::simon2mac_settings, GBVARS_SIMON2MACSETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON)
 _GSETPTR(Simon::simon2dos_settings, GBVARS_SIMON2DOSSETTINGS_INDEX, Simon::GameSpecificSettings, GBVARS_SIMON)
 _GSETPTR(Simon::_simon1_cursor, GBVARS_SIMON1CURSOR_INDEX, byte, GBVARS_SIMON)
-_GSETPTR(Simon::_simon2_cursors, GBVARS_SIMON2CURSORS_INDEX, const byte*, GBVARS_SIMON)
 _GEND
 
 _GRELEASE(Simon_Simon)
@@ -5171,7 +5170,6 @@
 _GRELEASEPTR(GBVARS_SIMON2MACSETTINGS_INDEX, GBVARS_SIMON)
 _GRELEASEPTR(GBVARS_SIMON2DOSSETTINGS_INDEX, GBVARS_SIMON)
 _GRELEASEPTR(GBVARS_SIMON1CURSOR_INDEX, GBVARS_SIMON)
-_GRELEASEPTR(GBVARS_SIMON2CURSORS_INDEX, GBVARS_SIMON)
 _GEND
 
 #endif





More information about the Scummvm-git-logs mailing list