summaryrefslogtreecommitdiff
path: root/src/environment.cpp
diff options
context:
space:
mode:
authorJacobF <queatz@gmail.com>2011-08-23 22:10:19 -0400
committerPerttu Ahola <celeron55@gmail.com>2011-09-06 20:07:43 +0300
commitbd72091150edac9d82beb8a65c25d68becd11aee (patch)
tree4a3b8cdd571657d159fa7106521b11115c7c2192 /src/environment.cpp
parentfaf3d7902aaf1a8eeaf339a127b267d97cd61cd6 (diff)
downloadminetest-bd72091150edac9d82beb8a65c25d68becd11aee.tar.gz
minetest-bd72091150edac9d82beb8a65c25d68becd11aee.tar.bz2
minetest-bd72091150edac9d82beb8a65c25d68becd11aee.zip
Pause in unloaded territory instead of collide
Diffstat (limited to 'src/environment.cpp')
-rw-r--r--src/environment.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/environment.cpp b/src/environment.cpp
index d6ff4d826..8103b7110 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -1512,6 +1512,11 @@ void ClientEnvironment::step(float dtime)
Get the speed the player is going
*/
bool is_climbing = lplayer->is_climbing;
+
+ /*
+ Check if the player is frozen (don't apply physics)
+ */
+ bool is_frozen = lplayer->is_frozen;
f32 player_speed = 0.001; // just some small value
player_speed = lplayer->getSpeed().getLength();
@@ -1570,7 +1575,7 @@ void ClientEnvironment::step(float dtime)
v3f lplayerpos = lplayer->getPosition();
// Apply physics
- if(free_move == false && is_climbing == false)
+ if(free_move == false && is_climbing == false && is_frozen == false)
{
// Gravity
v3f speed = lplayer->getSpeed();