--- deliantra/server/include/global.h 2007/02/15 15:43:36 1.43 +++ deliantra/server/include/global.h 2007/03/14 01:19:09 1.48 @@ -25,6 +25,8 @@ #ifndef GLOBAL_H #define GLOBAL_H +#define _GLIBCXX_CONCEPT_CHECKS + #ifndef EXTERN #define EXTERN extern #endif @@ -111,8 +113,6 @@ * GLOBAL VARIABLES: * *****************************************************************************/ -extern facetile *new_faces; - /* * These are the beginnings of linked lists: */ @@ -153,12 +153,13 @@ /* * 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; +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 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 @@ -174,12 +175,6 @@ extern int rightof_x[9], rightof_y[9]; extern int leftof_x[9], leftof_y[9]; -extern facetile *blank_face, *empty_face; -extern facetile *dark_faces[]; -extern facetile *smooth_face; - -extern client *init_sockets; - extern void emergency_save (); extern void cleanup (const char *cause, bool make_core = false); @@ -217,7 +212,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 */