diff options
| author | Max Horn | 2003-09-14 13:36:49 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-14 13:36:49 +0000 |
| commit | aa944976318af6276f46ca7b8eac0c0132f592a1 (patch) | |
| tree | 83cd128c0c065d1e5838427b2f5c7b3f36e0d042 /scumm | |
| parent | ad09725b3e0f95cc08cc8fb00f14a58cf61b9a72 (diff) | |
| download | scummvm-rg350-aa944976318af6276f46ca7b8eac0c0132f592a1.tar.gz scummvm-rg350-aa944976318af6276f46ca7b8eac0c0132f592a1.tar.bz2 scummvm-rg350-aa944976318af6276f46ca7b8eac0c0132f592a1.zip | |
reverse my fix for the sarcophagus problem (I reopened that bug report, as this broke lots of other locked boxees. Now that I have dosbox to compared with the original Zak, I see that we are doing something wrong, and have a notion of what that might be; still need to figure out a way how to fix it
svn-id: r10249
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/actor.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 212f46f27b..e53ac2402d 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1473,13 +1473,12 @@ void Actor::walkActorOld() { // Can't walk through locked boxes int flags = _vm->getBoxFlags(next_box); if (flags & kBoxLocked && !(flags & kBoxPlayerOnly && !isPlayer())) { -// moving |= MF_LAST_LEG; -// return; - break; + moving |= MF_LAST_LEG; + return; } walkdata.curbox = next_box; - + if (_vm->_version <= 2) { _vm->getClosestPtOnBox(walkdata.curbox, x, y, p2.x, p2.y); _vm->getClosestPtOnBox(walkbox, p2.x, p2.y, p3.x, p3.y); @@ -1488,7 +1487,7 @@ void Actor::walkActorOld() { if (p2.x == 32000 && p3.x == 32000) { break; } - + if (p2.x != 32000) { if (calcMovementFactor(p2)) { walkdata.point3 = p3; |