[Scummvm-cvs-logs] SF.net SVN: scummvm:[50961] scummvm/trunk/engines/sci/engine/vm.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50961
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50961&view=rev
Author:   m_kiewitz
Date:     2010-07-17 13:32:11 +0000 (Sat, 17 Jul 2010)

Log Message:
-----------
SCI: added gameid for send() sq4 workaround

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/vm.cpp

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-07-17 13:27:07 UTC (rev 50960)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-07-17 13:32:11 UTC (rev 50961)
@@ -646,14 +646,15 @@
 				// result of a script bug
 
 				const char *objectName = s->_segMan->getObjectName(send_obj);
+				const SciGameId gameId = g_sci->getGameId();
 
-				if (!strcmp(objectName, "Sq4GlobalNarrator") && selector == 606) {
+				if (gameId == GID_SQ4 && !strcmp(objectName, "Sq4GlobalNarrator") && selector == 606) {
 					// SQ4 has a script bug in the Sq4GlobalNarrator object when invoking the
 					// returnVal selector, which doesn't affect gameplay, thus don't diplay it
-				} else if (!strcmp(objectName, "longSong") && selector == 3 && g_sci->getGameId() == GID_QFG1VGA) {
+				} else if (gameId == GID_QFG1VGA && !strcmp(objectName, "longSong") && selector == 3) {
 					// QFG1VGA has a script bug in the longSong object when invoking the
 					// loop selector, which doesn't affect gameplay, thus don't diplay it
-				} else if (!strcmp(objectName, "PuzPiece") && selector == 77 && g_sci->getGameId() == GID_CASTLEBRAIN) {
+				} else if (gameId == GID_CASTLEBRAIN && !strcmp(objectName, "PuzPiece") && selector == 77) {
 					// Castle of Dr. Brain has a script bug in the PuzPiece object when invoking
 					// the value selector, which doesn't affect gameplay, thus don't display it
 				} else {


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