From ba4d93027f7b1590f303eff2138cae413faf5c34 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Fri, 26 Oct 2012 11:46:46 +0300 Subject: Joint positioning and rotation code, and fix a problem related to their lua API Attempt to move the animation system to a more correct implementation, rather than using object properties. Incomplete and breaks functionality --- src/genericobject.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/genericobject.h') diff --git a/src/genericobject.h b/src/genericobject.h index 81563c19b..c57cce8ba 100644 --- a/src/genericobject.h +++ b/src/genericobject.h @@ -28,8 +28,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #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_ANIMATIONS 4 +#define GENERIC_CMD_PUNCHED 5 +#define GENERIC_CMD_UPDATE_ARMOR_GROUPS 6 #include "object_properties.h" std::string gob_cmd_set_properties(const ObjectProperties &prop); @@ -54,6 +55,8 @@ std::string gob_cmd_set_sprite( bool select_horiz_by_yawpitch ); +std::string gob_cmd_set_animations(int frame_start, int frame_end, float frame_speed, float frame_blend); + std::string gob_cmd_punched(s16 damage, s16 result_hp); #include "itemgroup.h" -- cgit v1.2.3