diff options
| -rw-r--r-- | src/client/clientenvironment.cpp | 2 | ||||
| -rw-r--r-- | src/client/content_cao.cpp | 4 | ||||
| -rw-r--r-- | src/client/localplayer.h | 2 | ||||
| -rw-r--r-- | src/script/lua_api/l_localplayer.cpp | 4 | ||||
| -rw-r--r-- | src/script/lua_api/l_object.cpp | 6 | ||||
| -rw-r--r-- | src/server/player_sao.cpp | 2 | ||||
| -rw-r--r-- | src/server/player_sao.h | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/client/clientenvironment.cpp b/src/client/clientenvironment.cpp index 6c7ea6578..9107cf274 100644 --- 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 46007a622..c9778998a 100644 --- 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 04b78298b..2bb93f086 100644 --- a/src/client/localplayer.h +++ b/src/client/localplayer.h @@ -68,7 +68,7 @@ public: 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 703b13d65..409413928 100644 --- 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 3cb5882f0..cdb56f59c 100644 --- 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 174bef1b3..0a13b5064 100644 --- 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 66a0fb275..ca947f42e 100644 --- a/src/server/player_sao.h +++ b/src/server/player_sao.h @@ -227,7 +227,7 @@ public: 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; }; |