[Scummvm-cvs-logs] SF.net SVN: scummvm: [26104] scummvm/trunk/engines/scumm/actor.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Mar 12 14:28:02 CET 2007


Revision: 26104
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26104&view=rev
Author:   fingolfin
Date:     2007-03-12 06:28:01 -0700 (Mon, 12 Mar 2007)

Log Message:
-----------
Removing this old workaround: It no longer works, and causes an infinite loop. Am working on a new workaround/fix

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/actor.cpp

Modified: scummvm/trunk/engines/scumm/actor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/actor.cpp	2007-03-12 12:46:57 UTC (rev 26103)
+++ scummvm/trunk/engines/scumm/actor.cpp	2007-03-12 13:28:01 UTC (rev 26104)
@@ -621,12 +621,6 @@
 			break;
 
 		next_box = _vm->getNextBox(_walkbox, _walkdata.destbox);
-
-		// WORKAROUND: To fully fix bug #774783, we add a special case
-		// here, resulting in a different next_box value for Hitler.
-		if ((_vm->_game.id == GID_INDY3) && _vm->_roomResource == 46 && _walkbox == 1 && _walkdata.destbox == 0 && _number == 9)
-			next_box = 1;
-
 		if (next_box < 0) {
 			_moving |= MF_LAST_LEG;
 			return;


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