Make NodeMetaRef::getmeta a non-static member

[dragonfireclient.git] / src / genericobject.cpp

diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index f7b272b00d283a85abf7438649fc8e77527bcee2..c4660cf44ff4e78b71ce4a99c2639a2c5a6cd46d 100644 (file)
--- a/src/genericobject.cpp
+++ b/src/genericobject.cpp
@@ -110,14 +110,30 @@ std::string gob_cmd_update_armor_groups(const ItemGroupList &armor_groups)
        writeU8(os, GENERIC_CMD_UPDATE_ARMOR_GROUPS);
        writeU16(os, armor_groups.size());
        for(ItemGroupList::const_iterator i = armor_groups.begin();
-                       i != armor_groups.end(); i++){
+                       i != armor_groups.end(); ++i){
                os<<serializeString(i->first);
                writeS16(os, i->second);
        }
        return os.str();
 }
 
-std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend)
+std::string gob_cmd_update_physics_override(float physics_override_speed, float physics_override_jump,
+               float physics_override_gravity, bool sneak, bool sneak_glitch)
+{
+       std::ostringstream os(std::ios::binary);
+       // command 
+       writeU8(os, GENERIC_CMD_SET_PHYSICS_OVERRIDE);
+       // parameters
+       writeF1000(os, physics_override_speed);
+       writeF1000(os, physics_override_jump);
+       writeF1000(os, physics_override_gravity);
+       // these are sent inverted so we get true when the server sends nothing
+       writeU8(os, !sneak);
+       writeU8(os, !sneak_glitch);
+       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 
@@ -126,6 +142,8 @@ std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_
        writeV2F1000(os, frames);
        writeF1000(os, frame_speed);
        writeF1000(os, frame_blend);
+       // these are sent inverted so we get true when the server sends nothing
+       writeU8(os, !frame_loop);
        return os.str();
 }
 
@@ -145,7 +163,7 @@ std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f posit
 {
        std::ostringstream os(std::ios::binary);
        // command 
-       writeU8(os, GENERIC_CMD_SET_ATTACHMENT);
+       writeU8(os, GENERIC_CMD_ATTACH_TO);
        // parameters
        writeS16(os, parent_id);
        os<<serializeString(bone);
@@ -154,3 +172,25 @@ std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f posit
        return os.str();
 }
 
+std::string gob_cmd_update_nametag_attributes(video::SColor color)
+{
+       std::ostringstream os(std::ios::binary);
+       // command
+       writeU8(os, GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES);
+       // parameters
+       writeU8(os, 1); // version for forward compatibility
+       writeARGB8(os, color);
+       return os.str();
+}
+
+std::string gob_cmd_update_infant(u16 id, u8 type, std::string client_initialization_data)
+{
+       std::ostringstream os(std::ios::binary);
+       // command 
+       writeU8(os, GENERIC_CMD_SPAWN_INFANT);
+       // parameters
+       writeU16(os, id);
+       writeU8(os, type);
+       os<<serializeLongString(client_initialization_data);
+       return os.str();
+}