Fix crash on attaching player to entity

[minetest.git] / src / genericobject.h

diff --git a/src/genericobject.h b/src/genericobject.h
index 9a21baa6723fbdd156c07b326feae34fdfe029f3..48e71db756204511d685159baec5e16b215f2b66 100644 (file)
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -24,15 +24,20 @@ 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
+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,
+       GENERIC_CMD_SPAWN_INFANT
+};
 
 #include "object_properties.h"
 std::string gob_cmd_set_properties(const ObjectProperties &prop);
@@ -62,11 +67,18 @@ 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_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, 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_update_nametag_attributes(video::SColor color);
+
+std::string gob_cmd_update_infant(u16 id, u8 type, std::string client_initialization_data);
+
 #endif