diff options
| author | Max Horn | 2003-05-19 00:25:26 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-19 00:25:26 +0000 |
| commit | cf500b2450186ef3c9f34d651ca9ba5c0bb4c880 (patch) | |
| tree | fc18f728c7b83f2ade8ee6fbec8198d2fe7d56a9 /scumm | |
| parent | bd326e83f7525b7d1daccbc4d3a940a4f63cc5e0 (diff) | |
| download | scummvm-rg350-cf500b2450186ef3c9f34d651ca9ba5c0bb4c880.tar.gz scummvm-rg350-cf500b2450186ef3c9f34d651ca9ba5c0bb4c880.tar.bz2 scummvm-rg350-cf500b2450186ef3c9f34d651ca9ba5c0bb4c880.zip | |
enable box'ed walking in V2 games
svn-id: r7660
Diffstat (limited to 'scumm')
| -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); } |