--- deliantra/server/include/global.h 2007/01/15 21:06:19 1.39 +++ deliantra/server/include/global.h 2007/02/15 15:43:36 1.43 @@ -111,13 +111,11 @@ * GLOBAL VARIABLES: * *****************************************************************************/ -extern New_Face *new_faces; +extern facetile *new_faces; /* * These are the beginnings of linked lists: */ -EXTERN player *first_player; -EXTERN region *first_region; EXTERN treasurelist *first_treasurelist; EXTERN artifactlist *first_artifactlist; EXTERN archetype *first_archetype; @@ -157,12 +155,9 @@ */ EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch; -EXTERN std::vector animations; +EXTERN std::vector animations; EXTERN int num_animations,animations_allocated, bmaps_checksum; -/* 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 GET_ANIM_ID(ob) (ob->animation_id) @@ -179,9 +174,9 @@ extern int rightof_x[9], rightof_y[9]; extern int leftof_x[9], leftof_y[9]; -extern New_Face *blank_face, *empty_face; -extern New_Face *dark_faces[]; -extern New_Face *smooth_face; +extern facetile *blank_face, *empty_face; +extern facetile *dark_faces[]; +extern facetile *smooth_face; extern client *init_sockets;