--- deliantra/server/include/global.h 2007/03/18 03:05:40 1.49 +++ deliantra/server/include/global.h 2007/04/25 18:47:50 1.56 @@ -25,7 +25,7 @@ #ifndef GLOBAL_H #define GLOBAL_H -#define _GLIBCXX_CONCEPT_CHECKS +//#define _GLIBCXX_CONCEPT_CHECKS #ifndef EXTERN #define EXTERN extern @@ -66,6 +66,7 @@ #include "material.h" #include "living.h" #include "object.h" +#include "region.h" #include "map.h" #include "tod.h" @@ -116,7 +117,6 @@ /* * These are the beginnings of linked lists: */ -EXTERN treasurelist *first_treasurelist; EXTERN artifactlist *first_artifactlist; EXTERN archetype *first_archetype; EXTERN objectlink *first_friendly_object; /* Objects monsters will go after */ @@ -127,21 +127,15 @@ * Variables set by different flags (see init.c): */ -EXTERN bool warn_archetypes; /* If true, write warnings when failing */ - /* to find archetypes when loading from file */ EXTERN bool init_done; /* Ignores signals until init_done is true */ EXTERN bool in_cleanup; /* True when cleanup() is reached */ -extern long pticks; /* used by various function to determine */ +extern tick_t pticks; /* used by various function to determine */ /* how often to save the character */ /* * Misc global variables: */ EXTERN FILE *logfile; /* Used by server/daemon.c */ -EXTERN int exiting; /* True if the game is about to exit */ -EXTERN long nroftreasures; /* Only used in malloc_info() */ -EXTERN long nrofartifacts; /* Only used in malloc_info() */ -EXTERN long nrofallowedstr; /* Only used in malloc_info() */ EXTERN archetype *empty_archetype; /* Nice to have fast access to it */ EXTERN archetype *map_archeytpe; @@ -155,10 +149,6 @@ */ EXTERN archetype *ring_arch, *amulet_arch, *staff_arch, *crown_arch; -EXTERN std::vector animations; -EXTERN int num_animations, animations_allocated; -EXTERN uint32_t bmaps_checksum; - #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)