From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 3 Sep 2012 20:31:51 +0000 (+0300)
Subject: Fix shift-descend to ladders from a floor
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=0e6f7a21c60d162b3b7134882dc22dbd8acd014f;p=zefram%2Fminetest%2Fminetest_engine.git

Fix shift-descend to ladders from a floor
---

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 46a10c90..4b5e53fe 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -150,13 +150,16 @@ void LocalPlayer::move(f32 dtime, Map &map, f32 pos_max_d,
 		position.X = rangelim(position.X, lwn_f.X-maxd, lwn_f.X+maxd);
 		position.Z = rangelim(position.Z, lwn_f.Z-maxd, lwn_f.Z+maxd);
 		
-		f32 min_y = lwn_f.Y + 0.5*BS;
-		if(position.Y < min_y)
+		if(!is_climbing)
 		{
-			position.Y = min_y;
+			f32 min_y = lwn_f.Y + 0.5*BS;
+			if(position.Y < min_y)
+			{
+				position.Y = min_y;
 
-			if(m_speed.Y < 0)
-				m_speed.Y = 0;
+				if(m_speed.Y < 0)
+					m_speed.Y = 0;
+			}
 		}
 	}