[Scummvm-cvs-logs] SF.net SVN: scummvm: [22030] scummvm/trunk/engines/simon

[kirben at users.sourceforge.net]

Revision: 22030
Author:   kirben
Date:     2006-04-19 00:14:03 -0700 (Wed, 19 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22030&view=rev

Log Message:
-----------
Add FF difference in mouseOn script opcode

Modified Paths:
--------------
    scummvm/trunk/engines/simon/icons.cpp
    scummvm/trunk/engines/simon/items.cpp
Modified: scummvm/trunk/engines/simon/icons.cpp
===================================================================
--- scummvm/trunk/engines/simon/icons.cpp	2006-04-19 07:07:08 UTC (rev 22029)
+++ scummvm/trunk/engines/simon/icons.cpp	2006-04-19 07:14:03 UTC (rev 22030)
@@ -68,7 +68,7 @@
 		error("Out of icon memory");
 
 	memcpy(_iconFilePtr, src, 43 * 336);
-	unfreezeBottom();
+	o_unfreezeZones();
 }
 
 // Thanks to Stuart Caie for providing the original

Modified: scummvm/trunk/engines/simon/items.cpp
===================================================================
--- scummvm/trunk/engines/simon/items.cpp	2006-04-19 07:07:08 UTC (rev 22029)
+++ scummvm/trunk/engines/simon/items.cpp	2006-04-19 07:14:03 UTC (rev 22030)
@@ -2214,8 +2214,13 @@
 }
 
 void SimonEngine::scriptMouseOn() {
-	if (getGameType() == GType_SIMON2 && getBitFlag(79))
+	if (getGameType() == GType_FF && _mouseCursor != 5) {
+		resetVerbs();
+		_noRightClick = 0;
+	}
+	if (getGameType() == GType_SIMON2 && getBitFlag(79)) {
 		_mouseCursor = 0;
+	}
 	_mouseHideCount = 0;
 }
 


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