Make m_media_fetch_threads to contain MediaFetchThread* instead of MediaFetchThread

[minetest.git] / src / genericobject.h

diff --git a/src/genericobject.h b/src/genericobject.h
index a46a9474f1714494eefc761e7be61251ce57203e..b69c24b484574ce7dfed889abf34075cc432af42 100644 (file)
--- 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