summaryrefslogtreecommitdiff
path: root/src/content_sao.cpp
diff options
context:
space:
mode:
authorPilzAdam <pilzadam@minetest.net>2013-12-03 18:51:15 +0100
committerPilzAdam <pilzadam@minetest.net>2013-12-03 23:20:00 +0100
commit15be2659eae6da2c3807713eb6e068d8aa436423 (patch)
tree8c30131f868ca6a11389c4b0649e1d1980dfb8e6 /src/content_sao.cpp
parentd9de9f23d93a9a6fd8deccbbf3fce58aad5751a1 (diff)
downloadminetest-15be2659eae6da2c3807713eb6e068d8aa436423.tar.gz
minetest-15be2659eae6da2c3807713eb6e068d8aa436423.tar.bz2
minetest-15be2659eae6da2c3807713eb6e068d8aa436423.zip
Add sneak and sneak_glitch to set_physics_override()
Diffstat (limited to 'src/content_sao.cpp')
-rw-r--r--src/content_sao.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 85ab8d307..52b741365 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -969,6 +969,8 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
m_physics_override_speed(1),
m_physics_override_jump(1),
m_physics_override_gravity(1),
+ m_physics_override_sneak(true),
+ m_physics_override_sneak_glitch(true),
m_physics_override_sent(false)
{
assert(m_player);
@@ -1060,7 +1062,9 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version)
os<<serializeLongString(gob_cmd_update_bone_position((*ii).first, (*ii).second.X, (*ii).second.Y)); // m_bone_position.size
}
os<<serializeLongString(gob_cmd_update_attachment(m_attachment_parent_id, m_attachment_bone, m_attachment_position, m_attachment_rotation)); // 4
- os<<serializeLongString(gob_cmd_update_physics_override(m_physics_override_speed, m_physics_override_jump, m_physics_override_gravity)); // 5
+ 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
}
else
{
@@ -1187,7 +1191,9 @@ void PlayerSAO::step(float dtime, bool send_recommended)
if(m_physics_override_sent == false){
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);
+ 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);
// create message and add to list
ActiveObjectMessage aom(getId(), true, str);
m_messages_out.push_back(aom);