--- deliantra/server/include/global.h 2006/12/18 03:00:02 1.30 +++ deliantra/server/include/global.h 2006/12/25 11:25:49 1.32 @@ -53,8 +53,9 @@ // used only for tagging structure members so scripting languages // can easily parse the include files. -#define ACC_CLASS(name) +#define INTERFACE_CLASS(name) #define ACC(meta,member) member +#define MTH #include "keyword.h" #include "traits.h" @@ -178,9 +179,8 @@ /* Rotate right from bsd sum. This is used in various places for checksumming */ #define ROTATE_RIGHT(c) if ((c) & 01) (c) = ((c) >>1) + 0x80000000; else (c) >>= 1; - -#define SET_ANIMATION(ob,newanim) ob->face=&new_faces[animations[ob->animation_id].faces[newanim]] -#define GET_ANIMATION(ob,anim) (animations[ob->animation_id].faces[anim]) +#define SET_ANIMATION(ob,newanim) ob->face = new_faces + 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 @@ -206,7 +206,7 @@ #define decrease_ob(xyz) decrease_ob_nr(xyz,1) -ACC_CLASS (Settings) +INTERFACE_CLASS (Settings) struct Settings { char *ACC (RO, logfilename); /* logfile to use */ int ACC (RW, csport); /* port for new client/server */