System mouse code no longer required

svn-id: r24632

4 files changed, 7 insertions, 16 deletions

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index ed5f2a8a38..ee71df8ba5 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -255,7 +255,6 @@ AGOSEngine::AGOSEngine(OSystem *syst)
 	_firstTimeStruct = 0;
 	_pendingDeleteTimeEvent = 0;
 
-	_initMouse = 0;
 	_mouseX = 0;
 	_mouseY = 0;
 	_mouseXOld = 0;
@@ -837,7 +836,6 @@ int AGOSEngine::go() {
 	vc34_setMouseOff();
 
 	if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) {
-		_initMouse = 1;
 		loadMusic(0);
 	}
 
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 3f7d450719..5818975dde 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -367,7 +367,6 @@ protected:
 
 	TimeEvent *_firstTimeStruct, *_pendingDeleteTimeEvent;
 
-	bool _initMouse;
 	int _mouseX, _mouseY;
 	int _mouseXOld, _mouseYOld;
 
diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp
index 198627412d..1754af2551 100644
--- a/engines/agos/gfx.cpp
+++ b/engines/agos/gfx.cpp
@@ -989,19 +989,6 @@ void AGOSEngine::setWindowImageEx(uint16 mode, uint16 vga_res) {
 	if (mode == 4) {
 		vc29_stopAllSounds();
 
-		if (!_initMouse) {
-			_initMouse = 1;
-			vc33_setMouseOn();
-
-			// Set mouse palette
-			if (getGameType() == GType_WW) {
-				_displayPalette[65 * 4 + 0] = 48 * 4;
-				_displayPalette[65 * 4 + 1] = 48 * 4;
-				_displayPalette[65 * 4 + 2] = 40 * 4;
-				_displayPalette[65 * 4 + 3] = 0;
-			}
-		}
-
 		if (getGameType() == GType_ELVIRA1) {
 			if (_variableArray[299] == 0) {
 				_variableArray[293] = 0;
diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp
index d895eb341b..3a0725fbeb 100644
--- a/engines/agos/vga.cpp
+++ b/engines/agos/vga.cpp
@@ -1074,6 +1074,13 @@ void AGOSEngine::vc32_saveScreen() {
 void AGOSEngine::vc33_setMouseOn() {
 	if (_mouseHideCount != 0) {
 		_mouseHideCount = 1;
+		if (getGameType() == GType_ELVIRA2 || getGameType() == GType_WW) {
+			// Set mouse palette
+			_displayPalette[65 * 4 + 0] = 48 * 4;
+			_displayPalette[65 * 4 + 1] = 48 * 4;
+			_displayPalette[65 * 4 + 2] = 40 * 4;
+			_displayPalette[65 * 4 + 3] = 0;
+		}
 		mouseOn();
 	}
 }