[Scummvm-cvs-logs] SF.net SVN: scummvm: [32103] scummvm/trunk/engines/kyra/script_hof.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 32103
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32103&view=rev
Author:   eriktorbjorn
Date:     2008-05-14 02:43:41 -0700 (Wed, 14 May 2008)

Log Message:
-----------
Oops, I definitely meant for that to be '==', not '='. I guess this is what it
should look like, but I can't actually test (or even compile) it right now.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_hof.cpp

Modified: scummvm/trunk/engines/kyra/script_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_hof.cpp	2008-05-14 07:27:31 UTC (rev 32102)
+++ scummvm/trunk/engines/kyra/script_hof.cpp	2008-05-14 09:43:41 UTC (rev 32103)
@@ -907,17 +907,13 @@
 	//   animation.
 	// - When the sheriff enters the jail, either to lock you up or to throw
 	//   away the key. (see bug #1926838 "HoF: Animation plays too fast").
-	//   Adding the workaround for the first case also fixes the second,
-	//   even though stackPos(0) is different then.
 
-	// FIXME: Shouldn't the check for scene 27 be stackPos(0) == 1? Or is the change to
-	// stackPos(0) intentional here?
-
 	if ((stackPos(0) == 2 && _mainCharacter.sceneId == 3) ||
 		(stackPos(0) == 3 && _mainCharacter.sceneId == 33) ||
 		((stackPos(0) == 1 || stackPos(0) == 2) && _mainCharacter.sceneId == 19) ||
-		(stackPos(0) = 1 && _mainCharacter.sceneId == 27))
+		((stackPos(0) == 1 || stackPos(0) == 2) && _mainCharacter.sceneId == 27)) {
 		_sceneSpecialScriptsTimer[_lastProcessedSceneScript] = _system->getMillis() + _tickLength * 6;
+	}
 
 	_specialSceneScriptRunFlag = false;
 	return 0;


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