diff options
| -rw-r--r-- | scumm/boxes.cpp | 3 | ||||
| -rw-r--r-- | scumm/script_v2.cpp | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp index ae7d0c2839..3f67d524c3 100644 --- a/scumm/boxes.cpp +++ b/scumm/boxes.cpp @@ -577,8 +577,7 @@ int Scumm::getPathToDestBox(byte from, byte to) { boxm = getBoxMatrixBaseAddr(); if (_features & GF_AFTER_V2) { - i = boxm[from]; - boxm += numOfBoxes; + boxm += numOfBoxes + boxm[from]; return boxm[to]; } diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index b71f81b30e..c8b5d9e71b 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -920,7 +920,6 @@ void Scumm_v2::o2_walkActorTo() { y = getVarOrDirectByte(0x20) * 2; assert(a); - a->ignoreBoxes = true; // FIXME: Disabling walkboxes for now, just to debug the intro a->startWalkActor(x, y, -1); } |