diff options
| author | Treeki <treeki@gmail.com> | 2013-05-06 05:40:48 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-05-06 05:40:48 +0200 |
| commit | eb2790d40381a2348a53f4341ec4d879eea2d872 (patch) | |
| tree | c843ae51361a59443e2e4f2ed9bf0653f9d0a518 /src/koopatlas | |
| parent | 4b1bc5a8c6d865d6d2aa60a5863c04edc5877b56 (diff) | |
| download | kamek-eb2790d40381a2348a53f4341ec4d879eea2d872.tar.gz kamek-eb2790d40381a2348a53f4341ec4d879eea2d872.zip | |
fix stuff involving the path animations for the W3 cavern on map
Diffstat (limited to 'src/koopatlas')
| -rw-r--r-- | src/koopatlas/pathmanager.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/koopatlas/pathmanager.cpp b/src/koopatlas/pathmanager.cpp index c11e9d7..4651b3e 100644 --- a/src/koopatlas/pathmanager.cpp +++ b/src/koopatlas/pathmanager.cpp @@ -1096,6 +1096,9 @@ void dWMPathManager_c::startMovementTo(dKPPath_s *path) { if (!isScalingUp) playerScale = 0.0f; + } else if (scaleAnimProgress >= 0) { + // Keep the current scale + playerScale = player->scale.x; } player->visible = (path->animation != dKPPath_s::INVISIBLE); @@ -1220,7 +1223,7 @@ void dWMPathManager_c::moveThroughPath(int pressedDir) { dKPPath_s::JUMP, dKPPath_s::JUMP_SAND, dKPPath_s::JUMP_SNOW, dKPPath_s::JUMP_WATER, dKPPath_s::PIPE, dKPPath_s::DOOR, - dKPPath_s::ENTER_CAVE_UP, + dKPPath_s::ENTER_CAVE_UP, dKPPath_s::INVISIBLE, dKPPath_s::MAX_ANIM }; bool allowed = true; |