--- deliantra/server/include/global.h	2008/04/02 11:13:54	1.68
+++ deliantra/server/include/global.h	2008/12/26 10:36:42	1.74
@@ -1,7 +1,7 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
@@ -120,8 +120,6 @@
 /* Now for recipe/alchemy */
 #include "recipe.h"
 
-#include "funcpoint.h"
-
 /*****************************************************************************
  * GLOBAL VARIABLES:							     *
  *****************************************************************************/
@@ -146,19 +144,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,13 +161,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 ();
 
 #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 */
@@ -245,5 +236,9 @@
 
 void reset_signals ();
 
+#ifdef DEVEL
+# include "devel.h"
+#endif
+
 #endif /* GLOBAL_H */