[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.80,1.81

[Oliver Kiehl]

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

Modified Files:
	simon.cpp 
Log Message:
added cursor for simon1


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- simon.cpp	16 Nov 2002 15:59:40 -0000	1.80
+++ simon.cpp	16 Nov 2002 16:42:25 -0000	1.81
@@ -3090,7 +3090,25 @@
 {
 }
 
-
+static const byte _simon1_cursor[256] = {
+	0xe1,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+	0xe1,0xe1,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+	0xe1,0xe1,0xe1,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+	0xe1,0xe1,0xe1,0xe1,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+	0xe1,0xe1,0xe1,0xe1,0xe1,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+	0xe1,0xe1,0xe1,0xe1,0xe1,0xe1,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+	0xe1,0xe1,0xe1,0xe1,0xe0,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+	0xe1,0xff,0xff,0xe1,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+	0xff,0xff,0xff,0xff,0xe1,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+	0xff,0xff,0xff,0xff,0xe1,0xe0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
+	0xff,0xff,0xff,0xff,0xff,0xe1,0xe0,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,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,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,
+};
+	
 static const byte _simon2_cursors[10][256] = {
 	/* cross hair */
 	{ 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xec,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
@@ -3266,10 +3284,12 @@
 
 void SimonState::draw_mouse_pointer()
 {
-	if (_game & GAME_SIMON2) {
+	if (_game & GAME_SIMON2)
 		_system->set_mouse_cursor(_simon2_cursors[_mouse_cursor], 16, 16, 7, 7);
-		_system->show_mouse(true);
-	}
+	else
+		_system->set_mouse_cursor(_simon1_cursor, 16, 16, 0, 0);
+
+	_system->show_mouse(true);
 }
 
 
@@ -4513,8 +4533,6 @@
 
 void SimonState::go()
 {
-	OSystem::Property prop;
-
 	if (!_dump_file)
 		_dump_file = stdout;
 
@@ -4550,11 +4568,6 @@
 	_last_music_played = (uint) - 1;
 	_vga_base_delay = 1;
 	_vk_t_toggle = false;
-
-	if (!(_game & GAME_SIMON2)) {
-		prop.show_cursor = true;
-		_system->property(OSystem::PROP_SHOW_DEFAULT_CURSOR, &prop);
-	}
 
 	while (1) {
 		hitarea_stuff();