1 files changed, 24 insertions, 11 deletions

diff --git a/simon/simon.cpp b/simon/simon.cpp
index 5f3a309c82..60aaa803c1 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -3090,7 +3090,25 @@ void SimonState::processSpecialKeys()
 {
 }
 
-
+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 @@ static const byte _simon2_cursors[10][256] = {
 
 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::realizePalette()
 
 void SimonState::go()
 {
-	OSystem::Property prop;
-
 	if (!_dump_file)
 		_dump_file = stdout;
 
@@ -4551,11 +4569,6 @@ void SimonState::go()
 	_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();
 		handle_verb_clicked(_verb_hitarea);