[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.189,1.190

Max Horn fingolfin at users.sourceforge.net
Sat Dec 6 08:13:01 CET 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv29321

Modified Files:
	actor.cpp 
Log Message:
potential fix for bug #830106 (ugly)

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- actor.cpp	3 Dec 2003 06:34:45 -0000	1.189
+++ actor.cpp	6 Dec 2003 16:12:14 -0000	1.190
@@ -1544,8 +1544,11 @@
 		// FIXME: Fingolfin changed the destbox to curbox, matching walkActor.
 		// Motivation for this was comparision with some MI EGA disasm...
 		// However, that caused a regression in Indy3 (bug #809547).
-		setBox(walkdata.destbox);
-//		setBox(walkdata.curbox);
+		// On the other hand, curbox is needed to fix bug #830106... <sigh>
+		if (_vm->_version >= 3)
+			setBox(walkdata.destbox);
+		else
+			setBox(walkdata.curbox);
 	} while (1);
 
 	moving |= MF_LAST_LEG;





More information about the Scummvm-git-logs mailing list