Last set of minor cleanups

[dragonfireclient.git] / src / genericobject.cpp

diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index d915d78a548c55b12a43a07a1c87e6023b41fae1..398b07feb3a04e920fcbbf4df1b11719b75b6b77 100644 (file)
--- a/src/genericobject.cpp
+++ b/src/genericobject.cpp
@@ -92,30 +92,6 @@ std::string gob_cmd_set_sprite(
        return os.str();
 }
 
-std::string gob_cmd_set_animations(v2f frames, float frame_speed, float frame_blend)
-{
-       std::ostringstream os(std::ios::binary);
-       // command 
-       writeU8(os, GENERIC_CMD_SET_ANIMATIONS);
-       // parameters
-       writeV2F1000(os, frames);
-       writeF1000(os, frame_speed);
-       writeF1000(os, frame_blend);
-       return os.str();
-}
-
-std::string gob_cmd_set_bone_posrot(std::string bone, v3f position, v3f rotation)
-{
-       std::ostringstream os(std::ios::binary);
-       // command 
-       writeU8(os, GENERIC_CMD_SET_BONE_POSROT);
-       // parameters
-       os<<serializeString(bone);
-       writeV3F1000(os, position);
-       writeV3F1000(os, rotation);
-       return os.str();
-}
-
 std::string gob_cmd_punched(s16 damage, s16 result_hp)
 {
        std::ostringstream os(std::ios::binary);
@@ -141,4 +117,40 @@ std::string gob_cmd_update_armor_groups(const ItemGroupList &armor_groups)
        return os.str();
 }
 
+std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend)
+{
+       std::ostringstream os(std::ios::binary);
+       // command 
+       writeU8(os, GENERIC_CMD_SET_ANIMATION);
+       // parameters
+       writeV2F1000(os, frames);
+       writeF1000(os, frame_speed);
+       writeF1000(os, frame_blend);
+       return os.str();
+}
+
+std::string gob_cmd_update_bone_position(std::string bone, v3f position, v3f rotation)
+{
+       std::ostringstream os(std::ios::binary);
+       // command 
+       writeU8(os, GENERIC_CMD_SET_BONE_POSITION);
+       // parameters
+       os<<serializeString(bone);
+       writeV3F1000(os, position);
+       writeV3F1000(os, rotation);
+       return os.str();
+}
+
+std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f position, v3f rotation)
+{
+       std::ostringstream os(std::ios::binary);
+       // command 
+       writeU8(os, GENERIC_CMD_SET_ATTACHMENT);
+       // parameters
+       writeS16(os, parent_id);
+       os<<serializeString(bone);
+       writeV3F1000(os, position);
+       writeV3F1000(os, rotation);
+       return os.str();
+}