--- deliantra/server/include/global.h 2008/12/26 10:36:42 1.74 +++ deliantra/server/include/global.h 2009/05/05 04:51:56 1.76 @@ -150,16 +150,12 @@ EXTERN char errmsg[HUGE_BUF]; EXTERN long ob_count; -#define SET_ANIMATION(ob,newanim) ob->face = animations [ob->animation_id].faces [newanim] -#define GET_ANIMATION(ob,anim) animations [ob->animation_id].faces [anim] -#define GET_ANIM_ID(ob) (ob->animation_id) -/* NUM_ANIMATIONS returns the number of animations allocated. The last - * usuable animation will be NUM_ANIMATIONS-1 (for example, if an object - * has 8 animations, NUM_ANIMATIONS will return 8, but the values will - * range from 0 through 7. - */ -#define NUM_ANIMATIONS(ob) (animations[ob->animation_id].num_animations) -#define NUM_FACINGS(ob) (animations[ob->animation_id].facings) +extern dynbuf_text msg_dynbuf; // a dynbuf for text messages and other temporary data + +/* do not use these in new code, see object.h::animation */ +#define SET_ANIMATION(ob,frame) ob->set_anim_frame (frame) +#define NUM_ANIMATIONS(ob) (ob)->anim_frames () +#define NUM_FACINGS(ob) (ob)->anim_facings () // used only by treasure.C, does not handle null arch ptrs #define IS_ARCH(arch,name) ((arch)->archname == shstr_ ## name)