--- deliantra/server/include/global.h	2006/09/03 00:18:41	1.10
+++ deliantra/server/include/global.h	2006/09/16 22:06:17	1.17
@@ -1,9 +1,4 @@
 /*
- * static char *rcsid_global_h =
- *   "$Id$";
- */
-
-/*
     CrossFire, A Multiplayer game for X-windows
 
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -77,7 +72,6 @@
 typedef signed char	sint8;
 #define SINT8_MAX	127
 
-
 typedef unsigned short Fontindex;
 
 #ifdef WIN32
@@ -109,11 +103,14 @@
 
 #include <vector>
 
+#define ACC_CLASS(name)
+#define ACC(meta,member) member
+
 #include "keyword.h"
 #include "traits.h"
 #include "dynbuf.h"
-#include "shstr.h"
 #include "util.h"
+#include "shstr.h"
 
 /* This blob, in this order, is needed to actually define maps */
 #include "face.h"
@@ -149,7 +146,6 @@
   struct linked_char *next;
 } linked_char;
 
-
 /* Pull in artifacts */
 #include "artifact.h"
 
@@ -224,7 +220,6 @@
  * Used in treasure.c
  */
 EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch;
-extern shstr undead_name;	/* Used in hit_player() in main.c */
 
 extern std::vector<Animations> animations;
 EXTERN int num_animations,animations_allocated, bmaps_checksum;
@@ -401,12 +396,22 @@
 #define GETTIMEOFDAY(last_time) gettimeofday(last_time);
 #endif
 
-/* GROS: Those are used by plugin events (argument fixthem) */
-#define SCRIPT_FIX_ACTIVATOR 2
-#define SCRIPT_FIX_ALL 1
-#define SCRIPT_FIX_NOTHING 0
-
 #include "plugin.h"
 #include "cfperl.h"
 
+//TODO: various TEMPORARY link guards to avoid doing the wrong thing
+void free (object *);
+void free (archetype *);
+void free (recipe *);
+void free (linked_char *);
+void free (godlink *);
+void free (mapstruct *);
+void free (key_value *);
+void free (treasure *);
+void free (materialtype_t *);
+void free (player *);
+void free (New_Face *);
+void free (racelink *);
+
 #endif /* GLOBAL_H */
+