--- deliantra/server/include/global.h 2007/11/08 19:43:24 1.67 +++ deliantra/server/include/global.h 2008/04/21 06:35:26 1.71 @@ -146,19 +146,11 @@ /* * Misc global variables: */ -EXTERN FILE *logfile; /* Used by server/daemon.c */ - -EXTERN archetype *empty_archetype; /* Nice to have fast access to it */ -EXTERN archetype *map_archeytpe; EXTERN shstr first_map_path; /* The start-level */ EXTERN shstr first_map_ext_path; /* Path used for per-race start maps */ EXTERN char errmsg[HUGE_BUF]; EXTERN long ob_count; -/* - * Used in treasure.c - */ -EXTERN archetype *ring_arch, *amulet_arch, *staff_arch, *crown_arch; #define SET_ANIMATION(ob,newanim) ob->face = animations [ob->animation_id].faces [newanim] #define GET_ANIMATION(ob,anim) animations [ob->animation_id].faces [anim] @@ -171,14 +163,14 @@ #define NUM_ANIMATIONS(ob) (animations[ob->animation_id].num_animations) #define NUM_FACINGS(ob) (animations[ob->animation_id].facings) +// used only by treasure.C, does not handle null arch ptrs +#define IS_ARCH(arch,name) ((arch)->archname == shstr_ ## name) + extern void emergency_save (); -extern void cleanup (const char *cause, bool make_core = false); #include "libproto.h" #include "sockproto.h" -#define decrease_ob(xyz) decrease_ob_nr(xyz,1) - INTERFACE_CLASS (Settings) struct Settings { const char *ACC (RO, logfilename); /* logfile to use */