diff options
| author | Jonathan Gray | 2003-02-27 10:42:12 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-02-27 10:42:12 +0000 |
| commit | 18acc2e80007dee24a9173852f1e6cabc18ade51 (patch) | |
| tree | 3561e3cf8c341e05a8368c05ce00263b60aee182 /scumm/object.cpp | |
| parent | af19cac73829f9a24aea694052e274b6dd2d146b (diff) | |
| download | scummvm-rg350-18acc2e80007dee24a9173852f1e6cabc18ade51.tar.gz scummvm-rg350-18acc2e80007dee24a9173852f1e6cabc18ade51.tar.bz2 scummvm-rg350-18acc2e80007dee24a9173852f1e6cabc18ade51.zip | |
patch #693475 attempt to address the actor facing problems in comi by erik
svn-id: r6643
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 2192a81c13..d82fd54264 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -217,7 +217,10 @@ void Scumm::getObjectXYPos(int object, int &x, int &y, int &dir) 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 @@ void Scumm::setupRoomObject(ObjectData *od, byte *room, byte *searchptr) 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)); |