diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:35:23 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:40:58 +0200 |
| commit | 9c2341678ef4984bf92b3878295250faf980b066 (patch) | |
| tree | 2fb4805e05e16b9924e80c9947e6bad723b28c4b /engines/draci/walking.cpp | |
| parent | 8172d679df5148a4a32f46074b20cb6caf91844f (diff) | |
| parent | a5f4ff36ffc386d48f2da49387a9655ce9295a4d (diff) | |
| download | scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.gz scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.bz2 scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.zip | |
Merge branch 'master'
Diffstat (limited to 'engines/draci/walking.cpp')
| -rw-r--r-- | engines/draci/walking.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/engines/draci/walking.cpp b/engines/draci/walking.cpp index 9a66c6163a..f1ae769d80 100644 --- a/engines/draci/walking.cpp +++ b/engines/draci/walking.cpp @@ -729,20 +729,18 @@ Movement WalkingState::transitionBetweenAnimations(Movement previous, Movement n Movement WalkingState::animationForSightDirection(SightDirection dir, const Common::Point &hero, const Common::Point &mouse, const WalkingPath &path, Movement startingDirection) { switch (dir) { + case kDirectionLeft: + return kStopLeft; + case kDirectionRight: + return kStopRight; case kDirectionMouse: if (mouse.x < hero.x) { return kStopLeft; } else if (mouse.x > hero.x) { return kStopRight; - } else { - goto defaultCase; } - case kDirectionLeft: - return kStopLeft; - case kDirectionRight: - return kStopRight; + // fall-through here intentional default: { -defaultCase: // Find the last horizontal direction on the path. int i = path.size() - 1; while (i >= 0 && path[i].x == hero.x) { |