X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgenericobject.h;h=b92570831475025bb973fded7dc216ff05182a71;hb=8f49358153637bb87f492e558a13cf9f23046e64;hp=854950d27e5dd534050c6cf9a3b41b5fff24f6d7;hpb=86a963caca9604ad57904e9acd9bef7c46ca47d8;p=dragonfireclient.git

diff --git a/src/genericobject.h b/src/genericobject.h
index 854950d27..b92570831 100644
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -24,17 +24,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_bloated.h"
 #include <iostream>
 
-#define GENERIC_CMD_SET_PROPERTIES 0
-#define GENERIC_CMD_UPDATE_POSITION 1
-#define GENERIC_CMD_SET_TEXTURE_MOD 2
-#define GENERIC_CMD_SET_SPRITE 3
-#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
-#define GENERIC_CMD_SET_PHYSICS_OVERRIDE 9
-#define GENERIC_CMD_SET_NAMETAG_COLOR 10
+enum GenericCMD {
+	GENERIC_CMD_SET_PROPERTIES,
+	GENERIC_CMD_UPDATE_POSITION,
+	GENERIC_CMD_SET_TEXTURE_MOD,
+	GENERIC_CMD_SET_SPRITE,
+	GENERIC_CMD_PUNCHED,
+	GENERIC_CMD_UPDATE_ARMOR_GROUPS,
+	GENERIC_CMD_SET_ANIMATION,
+	GENERIC_CMD_SET_BONE_POSITION,
+	GENERIC_CMD_ATTACH_TO,
+	GENERIC_CMD_SET_PHYSICS_OVERRIDE,
+	GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES
+};
 
 #include "object_properties.h"
 std::string gob_cmd_set_properties(const ObjectProperties &prop);
@@ -67,13 +69,13 @@ 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);
 
-std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend);
+std::string gob_cmd_update_animation(v2f frames, float frame_speed, float frame_blend, bool frame_loop);
 
 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_set_nametag_color(video::SColor color);
+std::string gob_cmd_update_nametag_attributes(video::SColor color);
 
 #endif