[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.149,1.150

[Max Horn]

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

Modified Files:
	object.cpp 
Log Message:
regression fix (bug #855313)

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- object.cpp	6 Dec 2003 14:19:34 -0000	1.149
+++ object.cpp	6 Dec 2003 15:59:17 -0000	1.150
@@ -293,9 +293,11 @@
 	if (getObjectOrActorXY(b, x2, y2) == -1)
 		return 0xFF;
 
-	// Only call FOO in V5 games. Older versions don't seem to make this
-	// call at all, and using it caused at least one bug (#853874).
-	if (acta && _version == 5) {
+	// Perform adjustXYToBeInBox() *only* if the first item is an
+	// actor and the second is an object. This used to not check
+	// whether the second item is a non-actor, which caused bug
+	// #853874).
+	if (acta && !actb) {
 		AdjustBoxResult r = acta->adjustXYToBeInBox(x2, y2);
 		x2 = r.x;
 		y2 = r.y;