summaryrefslogtreecommitdiff
path: root/src/content_sao.cpp
diff options
context:
space:
mode:
authorparamat <mat.gregory@virginmedia.com>2017-04-05 12:18:22 +0100
committerparamat <mat.gregory@virginmedia.com>2017-04-17 10:13:05 +0100
commitf6da7b3fda5bbb793c7795a228ea6f2602b93fbe (patch)
treeca2bd50fdf29414cbee58576786170928676b8a5 /src/content_sao.cpp
parent907be0ab918a99c30c37c4abfe3e11722691f3bc (diff)
downloadminetest-f6da7b3fda5bbb793c7795a228ea6f2602b93fbe.tar.gz
minetest-f6da7b3fda5bbb793c7795a228ea6f2602b93fbe.tar.bz2
minetest-f6da7b3fda5bbb793c7795a228ea6f2602b93fbe.zip
Sneak: Add option for old move code
Temporary option for the old move code for specific old sneak behaviour. Enabled by setting the added 'new move' physics override to false. By default 'new move' is true.
Diffstat (limited to 'src/content_sao.cpp')
-rw-r--r--src/content_sao.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index bb2387d1a..908365397 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -789,6 +789,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, u16 peer_id_, bool is_singleplayer
m_physics_override_gravity(1),
m_physics_override_sneak(true),
m_physics_override_sneak_glitch(true),
+ m_physics_override_new_move(true),
m_physics_override_sent(false)
{
assert(m_peer_id != 0); // pre-condition
@@ -886,7 +887,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
msg_os << serializeLongString(gob_cmd_update_physics_override(m_physics_override_speed,
m_physics_override_jump, m_physics_override_gravity, m_physics_override_sneak,
- m_physics_override_sneak_glitch)); // 5
+ m_physics_override_sneak_glitch, m_physics_override_new_move)); // 5
// (GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES) : Deprecated, for backwards compatibility only.
msg_os << serializeLongString(gob_cmd_update_nametag_attributes(m_prop.nametag_color)); // 6
int message_count = 6 + m_bone_position.size();
@@ -1049,7 +1050,8 @@ void PlayerSAO::step(float dtime, bool send_recommended)
m_physics_override_sent = true;
std::string str = gob_cmd_update_physics_override(m_physics_override_speed,
m_physics_override_jump, m_physics_override_gravity,
- m_physics_override_sneak, m_physics_override_sneak_glitch);
+ m_physics_override_sneak, m_physics_override_sneak_glitch,
+ m_physics_override_new_move);
// create message and add to list
ActiveObjectMessage aom(getId(), true, str);
m_messages_out.push(aom);