Implement adding velocity to player from Lua

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

diff --git a/src/client/localplayer.cpp b/src/client/localplayer.cpp
index 0e273a16a4c7fd39cb966e72244771d8960a00a6..c356f7c24a9c5c6d2fbcebdf553b88c1ad181b52 100644 (file)
--- a/src/client/localplayer.cpp
+++ b/src/client/localplayer.cpp
@@ -188,6 +188,7 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
        // Copy parent position if local player is attached
        if (isAttached) {
                setPosition(overridePosition);
+               added_velocity = v3f(); // ignored
                return;
        }
 
@@ -201,9 +202,13 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
        if (noclip && free_move) {
                position += m_speed * dtime;
                setPosition(position);
+               added_velocity = v3f(); // ignored
                return;
        }
 
+       m_speed += added_velocity;
+       added_velocity = v3f();
+
        /*
                Collision detection
        */
@@ -782,6 +787,7 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
        if (isAttached) {
                setPosition(overridePosition);
                m_sneak_node_exists = false;
+               added_velocity = v3f();
                return;
        }
 
@@ -795,9 +801,13 @@ void LocalPlayer::old_move(f32 dtime, Environment *env, f32 pos_max_d,
                position += m_speed * dtime;
                setPosition(position);
                m_sneak_node_exists = false;
+               added_velocity = v3f();
                return;
        }
 
+       m_speed += added_velocity;
+       added_velocity = v3f();
+
        /*
                Collision detection
        */