Move duplicated mapgen parameters to class MapgenBasic (#9134)

[minetest.git] / src / genericobject.h

diff --git a/src/genericobject.h b/src/genericobject.h
index 29e5e29cb67481fc30846d6649bda20581eeb83d..c83b310d1c846ff2aeb2aca978f0aef997a4cc16 100644 (file)
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -17,23 +17,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef GENERICOBJECT_HEADER
-#define GENERICOBJECT_HEADER
+#pragma once
 
 #include <string>
 #include "irrlichttypes_bloated.h"
 #include <iostream>
+#include "itemgroup.h"
 
-#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
+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,
+       GENERIC_CMD_SET_ANIMATION_SPEED
+};
 
 #include "object_properties.h"
 std::string gob_cmd_set_properties(const ObjectProperties &prop);
@@ -43,7 +48,7 @@ std::string gob_cmd_update_position(
        v3f position,
        v3f velocity,
        v3f acceleration,
-       f32 yaw,
+       v3f rotation,
        bool do_interpolate,
        bool is_movement_end,
        f32 update_interval
@@ -58,19 +63,25 @@ std::string gob_cmd_set_sprite(
        bool select_horiz_by_yawpitch
 );
 
-std::string gob_cmd_punched(s16 damage, s16 result_hp);
+std::string gob_cmd_punched(u16 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_animation(v2f frames, float frame_speed, float frame_blend);
+std::string gob_cmd_update_animation_speed(float frame_speed);
 
-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);
 
-#endif
+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);