diff options
| author | Robert Crossfield | 2017-02-21 06:17:32 +1100 |
|---|---|---|
| committer | Robert Crossfield | 2017-02-21 06:17:32 +1100 |
| commit | 038b3b178939f1bcc6714eda1b88c3e80e787c02 (patch) | |
| tree | b198523b1418be4cc3d3997d9af9fc4e2081e202 | |
| parent | 02ac724c660133765c9c63db8768590c58bea897 (diff) | |
| download | scummvm-rg350-038b3b178939f1bcc6714eda1b88c3e80e787c02.tar.gz scummvm-rg350-038b3b178939f1bcc6714eda1b88c3e80e787c02.tar.bz2 scummvm-rg350-038b3b178939f1bcc6714eda1b88c3e80e787c02.zip | |
SCUMM: MM V0: Fix actors skipping between certain walk-boxes
| -rw-r--r-- | engines/scumm/actor.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index f888c69ac2..5b7e14406a 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -937,7 +937,6 @@ L2A33:; } if ((_moving & 0x0F) == 3) { -L2C36:; setTmpFromActor(); if (!_walkDirX) { @@ -980,7 +979,6 @@ L2C36:; // 2ADA if ((_moving & 0x0F) == 4) { -L2CA3:; setTmpFromActor(); if (!_walkDirY) { @@ -1045,7 +1043,7 @@ L2CA3:; directionUpdate(); animateActor(newDirToOldDir(_facing)); - goto L2C36; + return; } else { // 2B39 @@ -1064,7 +1062,7 @@ L2CA3:; directionUpdate(); animateActor(newDirToOldDir(_facing)); - goto L2CA3; + return; } } } |