From: Perttu Ahola <celeron55@gmail.com>
Date: Thu, 29 Nov 2012 17:22:07 +0000 (+0200)
Subject: Fix Taoki's messed up generic object command ids
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=30ec69c7d393f09bc683ef9894da2ddbae15fc6f;p=zefram%2Fminetest%2Fminetest_engine.git

Fix Taoki's messed up generic object command ids
---

diff --git a/src/genericobject.cpp b/src/genericobject.cpp
index 654548fa..398b07fe 100644
--- a/src/genericobject.cpp
+++ b/src/genericobject.cpp
@@ -92,6 +92,31 @@ std::string gob_cmd_set_sprite(
 	return os.str();
 }
 
+std::string gob_cmd_punched(s16 damage, s16 result_hp)
+{
+	std::ostringstream os(std::ios::binary);
+	// command 
+	writeU8(os, GENERIC_CMD_PUNCHED);
+	// damage
+	writeS16(os, damage);
+	// result_hp
+	writeS16(os, result_hp);
+	return os.str();
+}
+
+std::string gob_cmd_update_armor_groups(const ItemGroupList &armor_groups)
+{
+	std::ostringstream os(std::ios::binary);
+	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++){
+		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::ostringstream os(std::ios::binary);
@@ -129,29 +154,3 @@ std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f posit
 	return os.str();
 }
 
-std::string gob_cmd_punched(s16 damage, s16 result_hp)
-{
-	std::ostringstream os(std::ios::binary);
-	// command 
-	writeU8(os, GENERIC_CMD_PUNCHED);
-	// damage
-	writeS16(os, damage);
-	// result_hp
-	writeS16(os, result_hp);
-	return os.str();
-}
-
-std::string gob_cmd_update_armor_groups(const ItemGroupList &armor_groups)
-{
-	std::ostringstream os(std::ios::binary);
-	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++){
-		os<<serializeString(i->first);
-		writeS16(os, i->second);
-	}
-	return os.str();
-}
-
-
diff --git a/src/genericobject.h b/src/genericobject.h
index a46a9474..b69c24b4 100644
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -28,11 +28,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define GENERIC_CMD_UPDATE_POSITION 1
 #define GENERIC_CMD_SET_TEXTURE_MOD 2
 #define GENERIC_CMD_SET_SPRITE 3
-#define GENERIC_CMD_SET_ANIMATION 4
-#define GENERIC_CMD_SET_BONE_POSITION 5
-#define GENERIC_CMD_SET_ATTACHMENT 6
-#define GENERIC_CMD_PUNCHED 7
-#define GENERIC_CMD_UPDATE_ARMOR_GROUPS 8
+#define GENERIC_CMD_PUNCHED 4
+#define GENERIC_CMD_UPDATE_ARMOR_GROUPS 5
+#define GENERIC_CMD_SET_ANIMATION 6
+#define GENERIC_CMD_SET_BONE_POSITION 7
+#define GENERIC_CMD_SET_ATTACHMENT 8
 
 #include "object_properties.h"
 std::string gob_cmd_set_properties(const ObjectProperties &prop);
@@ -57,16 +57,16 @@ std::string gob_cmd_set_sprite(
 	bool select_horiz_by_yawpitch
 );
 
+std::string gob_cmd_punched(s16 damage, s16 result_hp);
+
+#include "itemgroup.h"
+std::string gob_cmd_update_armor_groups(const ItemGroupList &armor_groups);
+
 std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend);
 
 std::string gob_cmd_update_bone_position(std::string bone, v3f position, v3f rotation);
 
 std::string gob_cmd_update_attachment(int parent_id, std::string bone, v3f position, v3f rotation);
 
-std::string gob_cmd_punched(s16 damage, s16 result_hp);
-
-#include "itemgroup.h"
-std::string gob_cmd_update_armor_groups(const ItemGroupList &armor_groups);
-
 #endif