diff options
| author | Eugene Sandulenko | 2017-02-21 23:26:36 +0100 |
|---|---|---|
| committer | GitHub | 2017-02-21 23:26:36 +0100 |
| commit | 98bbb92a8e04dfb31ca942805a8ac36e1aafbcf8 (patch) | |
| tree | bd0c9601f1502c58e2e1bbbabd09bd6c862fc725 /engines | |
| parent | cca341804b636b9acbd55638d15cb61a9dcb27a1 (diff) | |
| parent | 038b3b178939f1bcc6714eda1b88c3e80e787c02 (diff) | |
| download | scummvm-rg350-98bbb92a8e04dfb31ca942805a8ac36e1aafbcf8.tar.gz scummvm-rg350-98bbb92a8e04dfb31ca942805a8ac36e1aafbcf8.tar.bz2 scummvm-rg350-98bbb92a8e04dfb31ca942805a8ac36e1aafbcf8.zip | |
Merge pull request #907 from segrax/Fix_SandySlide
SCUMM: MM V0: Fix two walk animation issues
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/actor.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index 8465526243..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; } } } @@ -2416,6 +2414,7 @@ void Actor_v0::startAnimActor(int f) { return; _speaking = 1; + speakCheck(); return; } |