Rename new_gravity to new new_acceleration

diff --git a/src/client/clientenvironment.cpp b/src/client/clientenvironment.cpp
index 6c7ea6578c1bacc4eface271fe466f17544fceba..9107cf274647ec12a668b9980038dc93363589cf 100644 (file)
--- a/src/client/clientenvironment.cpp
+++ b/src/client/clientenvironment.cpp
@@ -235,7 +235,7 @@ void ClientEnvironment::step(float dtime)
                                speed += d;
                        }
 
-                       lplayer->setSpeed(lplayer->physics_override_new_gravity
+                       lplayer->setSpeed(lplayer->physics_override_new_acceleration
                                ? (speed + old_speed) / 2.0f
                                : speed
                        );

diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index 46007a622413791b7889c365bf0630170c25017d..c9778998a71a91d18907f010fbfd5fc539bee29f 100644 (file)
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -1772,7 +1772,7 @@ void GenericCAO::processMessage(const std::string &data)
                bool sneak_glitch = !readU8(is);
                bool new_move = !readU8(is);
                // this one is off by default
-               bool new_gravity = readU8(is);
+               bool new_acceleration = readU8(is);
 
 
                if(m_is_local_player)
@@ -1784,7 +1784,7 @@ void GenericCAO::processMessage(const std::string &data)
                        player->physics_override_sneak = sneak;
                        player->physics_override_sneak_glitch = sneak_glitch;
                        player->physics_override_new_move = new_move;
-                       player->physics_override_new_gravity = new_gravity;
+                       player->physics_override_new_acceleration = new_acceleration;
                }
        } else if (cmd == AO_CMD_SET_ANIMATION) {
                // TODO: change frames send as v2s32 value

diff --git a/src/client/localplayer.h b/src/client/localplayer.h
index 04b78298bb40d13e768f1ead881efb6214a43eb0..2bb93f08676e26946be010b59218d28952f272ec 100644 (file)
--- a/src/client/localplayer.h
+++ b/src/client/localplayer.h
@@ -68,7 +68,7 @@ class LocalPlayer : public Player
        bool physics_override_sneak_glitch = false;
        // Temporary option for old move code
        bool physics_override_new_move = true;
-       bool physics_override_new_gravity = false;
+       bool physics_override_new_acceleration = false;
 
        void move(f32 dtime, Environment *env, f32 pos_max_d);
        void move(f32 dtime, Environment *env, f32 pos_max_d,

diff --git a/src/script/lua_api/l_localplayer.cpp b/src/script/lua_api/l_localplayer.cpp
index 703b13d65be71fc3ba2f3e736988deb91953d771..409413928f5417d831a15d44d6a824a045f8d4f3 100644 (file)
--- a/src/script/lua_api/l_localplayer.cpp
+++ b/src/script/lua_api/l_localplayer.cpp
@@ -176,8 +176,8 @@ int LuaLocalPlayer::l_get_physics_override(lua_State *L)
        lua_pushboolean(L, player->physics_override_new_move);
        lua_setfield(L, -2, "new_move");
 
-       lua_pushboolean(L, player->physics_override_new_gravity);
-       lua_setfield(L, -2, "new_gravity");
+       lua_pushboolean(L, player->physics_override_new_acceleration);
+       lua_setfield(L, -2, "new_acceleration");
 
        return 1;
 }

diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 3cb5882f0221bbdcb6869c000caa252ff01558b8..cdb56f59c65959aab9f2b28eb83a6a782b40e4d7 100644 (file)
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -1434,7 +1434,7 @@ int ObjectRef::l_set_physics_override(lua_State *L)
                modified |= getboolfield(L, 2, "sneak", playersao->m_physics_override_sneak);
                modified |= getboolfield(L, 2, "sneak_glitch", playersao->m_physics_override_sneak_glitch);
                modified |= getboolfield(L, 2, "new_move", playersao->m_physics_override_new_move);
-               modified |= getboolfield(L, 2, "new_gravity", playersao->m_physics_override_new_gravity);
+               modified |= getboolfield(L, 2, "new_acceleration", playersao->m_physics_override_new_acceleration);
                if (modified)
                        playersao->m_physics_override_sent = false;
        } else {
@@ -1480,8 +1480,8 @@ int ObjectRef::l_get_physics_override(lua_State *L)
        lua_setfield(L, -2, "sneak_glitch");
        lua_pushboolean(L, playersao->m_physics_override_new_move);
        lua_setfield(L, -2, "new_move");
-       lua_pushboolean(L, playersao->m_physics_override_new_gravity);
-       lua_setfield(L, -2, "new_gravity");
+       lua_pushboolean(L, playersao->m_physics_override_new_acceleration);
+       lua_setfield(L, -2, "new_acceleration");
        return 1;
 }
 

diff --git a/src/server/player_sao.cpp b/src/server/player_sao.cpp
index 174bef1b39f1f08aa06d527e382ad2ab34288a09..0a13b50644ead950ca760d441394c0e8982fac6f 100644 (file)
--- a/src/server/player_sao.cpp
+++ b/src/server/player_sao.cpp
@@ -317,7 +317,7 @@ std::string PlayerSAO::generateUpdatePhysicsOverrideCommand() const
        writeU8(os, !m_physics_override_sneak_glitch);
        writeU8(os, !m_physics_override_new_move);
        // this one is off by default
-       writeU8(os, m_physics_override_new_gravity);
+       writeU8(os, m_physics_override_new_acceleration);
        return os.str();
 }
 

diff --git a/src/server/player_sao.h b/src/server/player_sao.h
index 66a0fb275bf4ee04f85903b5fcba9a91e8f40a23..ca947f42eb5da7cc76d9b45e688529c164da810b 100644 (file)
--- a/src/server/player_sao.h
+++ b/src/server/player_sao.h
@@ -227,7 +227,7 @@ class PlayerSAO : public UnitSAO
        bool m_physics_override_sneak = true;
        bool m_physics_override_sneak_glitch = false;
        bool m_physics_override_new_move = true;
-       bool m_physics_override_new_gravity = false;
+       bool m_physics_override_new_acceleration = false;
        bool m_physics_override_sent = false;
 };