--- deliantra/server/include/global.h	2007/11/08 19:43:24	1.67
+++ deliantra/server/include/global.h	2008/04/20 00:44:12	1.70
@@ -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,8 +163,10 @@
 #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"