From eb2790d40381a2348a53f4341ec4d879eea2d872 Mon Sep 17 00:00:00 2001
From: Treeki <treeki@gmail.com>
Date: Mon, 6 May 2013 05:40:48 +0200
Subject: fix stuff involving the path animations for the W3 cavern on map

---
 src/koopatlas/pathmanager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

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;
-- 
cgit v1.2.3