aboutsummaryrefslogtreecommitdiff
path: root/src/client/content_cao.cpp
diff options
context:
space:
mode:
authorSmallJoker <SmallJoker@users.noreply.github.com>2022-08-12 11:17:02 +0200
committerGitHub <noreply@github.com>2022-08-12 10:17:02 +0100
commitc8ee755c05ca4410b9b1e816a9244b3cf303d3fe (patch)
tree25a898cc692ba6a996f32d8248dde153847cd539 /src/client/content_cao.cpp
parentdf1d215f4823b82f704b06eae0179c5e6c6b97af (diff)
downloadminetest-c8ee755c05ca4410b9b1e816a9244b3cf303d3fe.tar.xz
Physics overrides: Move values to a common struct (#12591)
Co-authored-by: sfan5 <sfan5@live.de>
Diffstat (limited to 'src/client/content_cao.cpp')
-rw-r--r--src/client/content_cao.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index 568d25fb7..9bd1df1ab 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -1762,21 +1762,20 @@ void GenericCAO::processMessage(const std::string &data)
float override_speed = readF32(is);
float override_jump = readF32(is);
float override_gravity = readF32(is);
- // these are sent inverted so we get true when the server sends nothing
+ // MT 0.4.10 legacy: send inverted for detault `true` if the server sends nothing
bool sneak = !readU8(is);
bool sneak_glitch = !readU8(is);
bool new_move = !readU8(is);
- if(m_is_local_player)
- {
- LocalPlayer *player = m_env->getLocalPlayer();
- player->physics_override_speed = override_speed;
- player->physics_override_jump = override_jump;
- player->physics_override_gravity = override_gravity;
- player->physics_override_sneak = sneak;
- player->physics_override_sneak_glitch = sneak_glitch;
- player->physics_override_new_move = new_move;
+ if (m_is_local_player) {
+ auto &phys = m_env->getLocalPlayer()->physics_override;
+ phys.speed = override_speed;
+ phys.jump = override_jump;
+ phys.gravity = override_gravity;
+ phys.sneak = sneak;
+ phys.sneak_glitch = sneak_glitch;
+ phys.new_move = new_move;
}
} else if (cmd == AO_CMD_SET_ANIMATION) {
// TODO: change frames send as v2s32 value