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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Mar 12 13:16:42 CET 2007


Revision: 26102
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26102&view=rev
Author:   fingolfin
Date:     2007-03-12 05:16:41 -0700 (Mon, 12 Mar 2007)

Log Message:
-----------
Fix a discrepancy between our V3 walking code and disasm (besides, using destbox instead of curbox was illogical, too)

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:11:59 UTC (rev 26101)
+++ scummvm/trunk/engines/scumm/actor.cpp	2007-03-12 12:16:41 UTC (rev 26102)
@@ -655,7 +655,7 @@
 		if (calcMovementFactor(p3))
 			return;
 
-		setBox(_walkdata.destbox);
+		setBox(_walkdata.curbox);
 	} while (1);
 
 	_moving |= MF_LAST_LEG;
@@ -1467,7 +1467,7 @@
 
 	bcr->_clipOverride = _clipOverride;
 
-	if (_vm->_game.version == 4 && _boxscale & 0x8000) {
+	if (_vm->_game.version == 4 && (_boxscale & 0x8000)) {
 		bcr->_scaleX = bcr->_scaleY = _vm->getScaleFromSlot((_boxscale & 0x7fff) + 1, _pos.x, _pos.y);
 	} else {
 		bcr->_scaleX = _scalex;


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