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

kirben at users.sourceforge.net kirben at users.sourceforge.net
Fri May 26 03:15:03 CEST 2006


Revision: 22653
Author:   kirben
Date:     2006-05-26 03:14:06 -0700 (Fri, 26 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22653&view=rev

Log Message:
-----------
isSpriteLoaded() is used by FF,  a similar function was commented out in original code

Modified Paths:
--------------
    scummvm/trunk/engines/simon/simon.cpp
    scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-05-26 09:48:40 UTC (rev 22652)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-05-26 10:14:06 UTC (rev 22653)
@@ -1780,8 +1780,7 @@
 
 	_lockWord |= 0x40;
 
-	if ((getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) &&
-		isSpriteLoaded(vgaSpriteId, zoneNum)) {
+	if (isSpriteLoaded(vgaSpriteId, zoneNum)) {
 		_lockWord &= ~0x40;
 		return;
 	}

Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp	2006-05-26 09:48:40 UTC (rev 22652)
+++ scummvm/trunk/engines/simon/vga.cpp	2006-05-26 10:14:06 UTC (rev 22653)
@@ -388,10 +388,8 @@
 	y = vcReadNextWord();			/* 6 */
 	palette = vcReadNextWord();		/* 8 */
 
-	if ((getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) &&
-		isSpriteLoaded(vgaSpriteId, zoneNum)) {
+	if (isSpriteLoaded(vgaSpriteId, zoneNum))
 		return;
-	}
 
 	vsp = _vgaSprites;
 	while (vsp->id)


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





More information about the Scummvm-git-logs mailing list