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

[kirben at users.sourceforge.net]

Revision: 24362
          http://svn.sourceforge.net/scummvm/?rev=24362&view=rev
Author:   kirben
Date:     2006-10-18 05:23:43 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
Fix display of sword cursor in WW

Modified Paths:
--------------
    scummvm/trunk/engines/agos/cursor.cpp
    scummvm/trunk/engines/agos/verb.cpp

Modified: scummvm/trunk/engines/agos/cursor.cpp
===================================================================
--- scummvm/trunk/engines/agos/cursor.cpp	2006-10-18 11:52:55 UTC (rev 24361)
+++ scummvm/trunk/engines/agos/cursor.cpp	2006-10-18 12:23:43 UTC (rev 24362)
@@ -387,6 +387,12 @@
 		get_out2:;
 			_vgaVar9 = 0;
 		}
+	} else if (getGameType() == GType_WW || getGameType() == GType_ELVIRA2) {
+		uint swordCursor = (getGameType() == GType_WW) ? _variableArray[51] : _variableArray[72];
+		if (swordCursor != 0 && _mouseCursor != swordCursor) {
+			_mouseCursor = swordCursor;
+			_needHitAreaRecalc++;
+		}
 	}
 
 	if (_mouseX != _mouseXOld || _mouseY != _mouseYOld)

Modified: scummvm/trunk/engines/agos/verb.cpp
===================================================================
--- scummvm/trunk/engines/agos/verb.cpp	2006-10-18 11:52:55 UTC (rev 24361)
+++ scummvm/trunk/engines/agos/verb.cpp	2006-10-18 12:23:43 UTC (rev 24362)
@@ -744,9 +744,10 @@
 
 	if (best_ha == NULL) {
 		clearName();
-		if (getGameType() == GType_WW && _mouseCursor >= 4)
+		if (getGameType() == GType_WW && _mouseCursor >= 4) {
 			_mouseCursor = 0;
-
+			_needHitAreaRecalc++;
+		}
 		return;
 	}
 


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