From 0e6f7a21c60d162b3b7134882dc22dbd8acd014f Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 3 Sep 2012 23:31:51 +0300 Subject: [PATCH] Fix shift-descend to ladders from a floor --- src/localplayer.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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; + } } }