[Scummvm-cvs-logs] SF.net SVN: scummvm: [24632] scummvm/trunk/engines/agos

[kirben at users.sourceforge.net]

Revision: 24632
          http://svn.sourceforge.net/scummvm/?rev=24632&view=rev
Author:   kirben
Date:     2006-11-05 23:58:37 -0800 (Sun, 05 Nov 2006)

Log Message:
-----------
System mouse code no longer required

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp
    scummvm/trunk/engines/agos/agos.h
    scummvm/trunk/engines/agos/gfx.cpp
    scummvm/trunk/engines/agos/vga.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2006-11-06 01:32:20 UTC (rev 24631)
+++ scummvm/trunk/engines/agos/agos.cpp	2006-11-06 07:58:37 UTC (rev 24632)
@@ -255,7 +255,6 @@
 	_firstTimeStruct = 0;
 	_pendingDeleteTimeEvent = 0;
 
-	_initMouse = 0;
 	_mouseX = 0;
 	_mouseY = 0;
 	_mouseXOld = 0;
@@ -837,7 +836,6 @@
 	vc34_setMouseOff();
 
 	if (getGameType() == GType_ELVIRA1 && getFeatures() & GF_DEMO) {
-		_initMouse = 1;
 		loadMusic(0);
 	}
 

Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h	2006-11-06 01:32:20 UTC (rev 24631)
+++ scummvm/trunk/engines/agos/agos.h	2006-11-06 07:58:37 UTC (rev 24632)
@@ -367,7 +367,6 @@
 
 	TimeEvent *_firstTimeStruct, *_pendingDeleteTimeEvent;
 
-	bool _initMouse;
 	int _mouseX, _mouseY;
 	int _mouseXOld, _mouseYOld;
 

Modified: scummvm/trunk/engines/agos/gfx.cpp
===================================================================
--- scummvm/trunk/engines/agos/gfx.cpp	2006-11-06 01:32:20 UTC (rev 24631)
+++ scummvm/trunk/engines/agos/gfx.cpp	2006-11-06 07:58:37 UTC (rev 24632)
@@ -989,19 +989,6 @@
 	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;

Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp	2006-11-06 01:32:20 UTC (rev 24631)
+++ scummvm/trunk/engines/agos/vga.cpp	2006-11-06 07:58:37 UTC (rev 24632)
@@ -1074,6 +1074,13 @@
 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();
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.