Cpp11 initializers: last src root changeset (#6022)

[oweals/minetest.git] / src / genericobject.h

diff --git a/src/genericobject.h b/src/genericobject.h
index b92570831475025bb973fded7dc216ff05182a71..d22d7ef0707ee9c401a563ab784769c312e07541 100644 (file)
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 #include "irrlichttypes_bloated.h"
 #include <iostream>
+#include "itemgroup.h"
 
 enum GenericCMD {
        GENERIC_CMD_SET_PROPERTIES,
@@ -35,7 +36,8 @@ enum GenericCMD {
        GENERIC_CMD_SET_BONE_POSITION,
        GENERIC_CMD_ATTACH_TO,
        GENERIC_CMD_SET_PHYSICS_OVERRIDE,
-       GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES
+       GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES,
+       GENERIC_CMD_SPAWN_INFANT
 };
 
 #include "object_properties.h"
@@ -63,19 +65,24 @@ std::string gob_cmd_set_sprite(
 
 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_physics_override(float physics_override_speed,
-               float physics_override_jump, float physics_override_gravity, bool sneak, bool sneak_glitch);
+               float physics_override_jump, float physics_override_gravity,
+               bool sneak, bool sneak_glitch, bool new_move);
 
 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_bone_position(const 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_attachment(int parent_id, const 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,
+               const std::string &client_initialization_data);
+
 #endif