[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.61,1.62

[Jonathan Gray]

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

Modified Files:
	object.cpp 
Log Message:
patch #693475 attempt to address the actor facing problems in comi by erik

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- object.cpp	26 Jan 2003 10:57:01 -0000	1.61
+++ object.cpp	27 Feb 2003 10:42:12 -0000	1.62
@@ -217,7 +217,10 @@
 		x = od->walk_x;
 		y = od->walk_y;
 	}
-	dir = oldDirToNewDir(od->actordir & 3);
+	if (_features & GF_AFTER_V8)
+		dir = od->actordir;
+	else
+		dir = oldDirToNewDir(od->actordir & 3);
 }
 
 int Scumm::getObjActToObjActDist(int a, int b)
@@ -654,7 +657,7 @@
 		od->y_pos = (int)READ_LE_UINT32(&imhd->v8.y_pos);
 		od->width = (uint)READ_LE_UINT32(&imhd->v8.width);
 		od->height = (uint)READ_LE_UINT32(&imhd->v8.height);
-		od->actordir = (byte)READ_LE_UINT32(&imhd->v8.actordir);
+		od->actordir = READ_LE_UINT32(&imhd->v8.actordir);
 
 	} else if (_features & GF_AFTER_V7) {
 		od->obj_nr = READ_LE_UINT16(&(cdhd->v7.obj_id));