summaryrefslogtreecommitdiff
path: root/src/environment.cpp
diff options
context:
space:
mode:
authorMark Holmquist <marktraceur@gmail.com>2011-07-30 21:53:05 -0700
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-08-01 09:22:44 +0200
commit267744a56871f6eecbb80c7999c2fcd79989fc1e (patch)
tree8bd2e148b07656048280efeac9449f08e1551fa9 /src/environment.cpp
parent8e67f4c4e617a8fcbb9176de1bf0b267acfc6e2f (diff)
downloadminetest-267744a56871f6eecbb80c7999c2fcd79989fc1e.tar.gz
minetest-267744a56871f6eecbb80c7999c2fcd79989fc1e.tar.bz2
minetest-267744a56871f6eecbb80c7999c2fcd79989fc1e.zip
Fixing ladders again
Diffstat (limited to 'src/environment.cpp')
-rw-r--r--src/environment.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/environment.cpp b/src/environment.cpp
index e9b94f3fa..680d209fc 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -1511,6 +1511,8 @@ void ClientEnvironment::step(float dtime)
/*
Get the speed the player is going
*/
+ bool is_climbing = lplayer->is_climbing;
+
f32 player_speed = 0.001; // just some small value
player_speed = lplayer->getSpeed().getLength();
@@ -1568,7 +1570,7 @@ void ClientEnvironment::step(float dtime)
v3f lplayerpos = lplayer->getPosition();
// Apply physics
- if(free_move == false)
+ if(free_move == false && is_climbing == false)
{
// Gravity
v3f speed = lplayer->getSpeed();