diff options
Diffstat (limited to 'src/genericobject.cpp')
| -rw-r--r-- | src/genericobject.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/genericobject.cpp b/src/genericobject.cpp index c4660cf44..58f4b997e 100644 --- a/src/genericobject.cpp +++ b/src/genericobject.cpp @@ -68,7 +68,7 @@ std::string gob_cmd_update_position( std::string gob_cmd_set_texture_mod(const std::string &mod) { std::ostringstream os(std::ios::binary); - // command + // command writeU8(os, GENERIC_CMD_SET_TEXTURE_MOD); // parameters os<<serializeString(mod); @@ -95,7 +95,7 @@ std::string gob_cmd_set_sprite( std::string gob_cmd_punched(s16 damage, s16 result_hp) { std::ostringstream os(std::ios::binary); - // command + // command writeU8(os, GENERIC_CMD_PUNCHED); // damage writeS16(os, damage); @@ -118,10 +118,10 @@ std::string gob_cmd_update_armor_groups(const ItemGroupList &armor_groups) } std::string gob_cmd_update_physics_override(float physics_override_speed, float physics_override_jump, - float physics_override_gravity, bool sneak, bool sneak_glitch) + float physics_override_gravity, bool sneak, bool sneak_glitch, bool new_move) { std::ostringstream os(std::ios::binary); - // command + // command writeU8(os, GENERIC_CMD_SET_PHYSICS_OVERRIDE); // parameters writeF1000(os, physics_override_speed); @@ -130,13 +130,14 @@ std::string gob_cmd_update_physics_override(float physics_override_speed, float // these are sent inverted so we get true when the server sends nothing writeU8(os, !sneak); writeU8(os, !sneak_glitch); + writeU8(os, !new_move); return os.str(); } std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend, bool frame_loop) { std::ostringstream os(std::ios::binary); - // command + // command writeU8(os, GENERIC_CMD_SET_ANIMATION); // parameters writeV2F1000(os, frames); @@ -147,10 +148,11 @@ std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_ return os.str(); } -std::string gob_cmd_update_bone_position(std::string bone, v3f position, v3f rotation) +std::string gob_cmd_update_bone_position(const std::string &bone, v3f position, + v3f rotation) { std::ostringstream os(std::ios::binary); - // command + // command writeU8(os, GENERIC_CMD_SET_BONE_POSITION); // parameters os<<serializeString(bone); @@ -159,10 +161,11 @@ std::string gob_cmd_update_bone_position(std::string bone, v3f position, v3f rot return os.str(); } -std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f position, v3f rotation) +std::string gob_cmd_update_attachment(int parent_id, const std::string &bone, + v3f position, v3f rotation) { std::ostringstream os(std::ios::binary); - // command + // command writeU8(os, GENERIC_CMD_ATTACH_TO); // parameters writeS16(os, parent_id); @@ -183,10 +186,11 @@ std::string gob_cmd_update_nametag_attributes(video::SColor color) return os.str(); } -std::string gob_cmd_update_infant(u16 id, u8 type, std::string client_initialization_data) +std::string gob_cmd_update_infant(u16 id, u8 type, + const std::string &client_initialization_data) { std::ostringstream os(std::ios::binary); - // command + // command writeU8(os, GENERIC_CMD_SPAWN_INFANT); // parameters writeU16(os, id); |