Add LuaSecureRandom

[oweals/minetest.git] / src / localplayer.cpp

diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 77e7a9e16f426a45ea9c94e9095ea3210d1c05fe..e55464479aa177b6042d949230ff74aad038b5bc 100644 (file)
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -344,7 +344,7 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
                }
        }
 
-       if(!touching_ground_was && touching_ground){
+       if(!result.standing_on_object && !touching_ground_was && touching_ground) {
                MtEvent *e = new SimpleTriggerEvent("PlayerRegainGround");
                m_gamedef->event()->put(e);
 
@@ -512,15 +512,16 @@ void LocalPlayer::applyControl(float dtime)
                }
        }
 
-       if(continuous_forward)
+       if (continuous_forward)
                speedH += move_direction;
 
-       if(control.up)
-       {
-               if(continuous_forward)
-                       superspeed = true;
-               else
+       if (control.up) {
+               if (continuous_forward) {
+                       if (fast_move)
+                               superspeed = true;
+               } else {
                        speedH += move_direction;
+               }
        }
        if(control.down)
        {