aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.cpp
diff options
context:
space:
mode:
authorMax Horn2003-12-06 16:12:14 +0000
committerMax Horn2003-12-06 16:12:14 +0000
commit4afcd1747c4c86afe0d35b6456476a57122d5743 (patch)
treeff1a17a8fa0e565874efbe48bccfc0f1e68e8621 /scumm/actor.cpp
parentd483e58a9999afd3a0027abcc65921f5c67d337d (diff)
downloadscummvm-rg350-4afcd1747c4c86afe0d35b6456476a57122d5743.tar.gz
scummvm-rg350-4afcd1747c4c86afe0d35b6456476a57122d5743.tar.bz2
scummvm-rg350-4afcd1747c4c86afe0d35b6456476a57122d5743.zip
potential fix for bug #830106 (ugly)
svn-id: r11525
Diffstat (limited to 'scumm/actor.cpp')
-rw-r--r--scumm/actor.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index b1763e523b..60a3ff0bc6 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1544,8 +1544,11 @@ void Actor::walkActorOld() {
// FIXME: Fingolfin changed the destbox to curbox, matching walkActor.
// Motivation for this was comparision with some MI EGA disasm...
// However, that caused a regression in Indy3 (bug #809547).
- setBox(walkdata.destbox);
-// setBox(walkdata.curbox);
+ // On the other hand, curbox is needed to fix bug #830106... <sigh>
+ if (_vm->_version >= 3)
+ setBox(walkdata.destbox);
+ else
+ setBox(walkdata.curbox);
} while (1);
moving |= MF_LAST_LEG;