--- deliantra/server/include/global.h 2007/02/15 15:00:01 1.42 +++ deliantra/server/include/global.h 2007/03/06 19:02:35 1.46 @@ -153,17 +153,11 @@ /* * Used in treasure.c */ -EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch; +EXTERN archetype *ring_arch, *amulet_arch, *staff_arch, *crown_arch; EXTERN std::vector animations; -EXTERN int num_animations,animations_allocated, bmaps_checksum; - -/* Rotate right. This is used in various places for checksumming */ -static inline uint32_t -ROTATE_RIGHT (uint32_t c) -{ - return (c >> 31) | (c << 1); -} +EXTERN int num_animations, animations_allocated; +EXTERN uint32_t bmaps_checksum; #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] @@ -183,7 +177,6 @@ extern facetile *blank_face, *empty_face; extern facetile *dark_faces[]; -extern facetile *smooth_face; extern client *init_sockets; @@ -224,7 +217,6 @@ uint8 ACC (RW, balanced_stat_loss); /* If true, Death stat depletion based on level etc */ uint8 ACC (RW, not_permadeth); /* if true, death is non-permament */ uint8 ACC (RW, simple_exp); /* If true, use the simple experience system */ - int ACC (RW, reset_loc_time); /* Number of seconds to put player back at home */ uint8 ACC (RW, set_title); /* players can set thier title */ uint8 ACC (RW, resurrection); /* ressurection possible w/ permadeth on */ uint8 ACC (RW, search_items); /* search_items command */