X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgenericobject.h;h=c83b310d1c846ff2aeb2aca978f0aef997a4cc16;hb=60544ac56f13132ef24ce38024627a127f7f15f0;hp=7d2ec4b148000ebe548742cbe53c713e10bcc969;hpb=f6da7b3fda5bbb793c7795a228ea6f2602b93fbe;p=dragonfireclient.git

diff --git a/src/genericobject.h b/src/genericobject.h
index 7d2ec4b14..c83b310d1 100644
--- a/src/genericobject.h
+++ b/src/genericobject.h
@@ -17,12 +17,12 @@ 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"
 
 enum GenericCMD {
 	GENERIC_CMD_SET_PROPERTIES,
@@ -36,7 +36,8 @@ enum GenericCMD {
 	GENERIC_CMD_ATTACH_TO,
 	GENERIC_CMD_SET_PHYSICS_OVERRIDE,
 	GENERIC_CMD_UPDATE_NAMETAG_ATTRIBUTES,
-	GENERIC_CMD_SPAWN_INFANT
+	GENERIC_CMD_SPAWN_INFANT,
+	GENERIC_CMD_SET_ANIMATION_SPEED
 };
 
 #include "object_properties.h"
@@ -47,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
@@ -62,9 +63,8 @@ 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,
@@ -73,13 +73,15 @@ std::string gob_cmd_update_physics_override(float physics_override_speed,
 
 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_animation_speed(float frame_speed);
 
-std::string gob_cmd_update_attachment(int parent_id, 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_nametag_attributes(video::SColor color);
+std::string gob_cmd_update_attachment(int parent_id, const std::string &bone,
+		v3f position, v3f rotation);
 
-std::string gob_cmd_update_infant(u16 id, u8 type, std::string client_initialization_data);
-
-#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);