--- deliantra/server/include/global.h	2006/09/03 23:33:00	1.13
+++ deliantra/server/include/global.h	2006/09/16 22:24:12	1.18
@@ -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,6 +103,9 @@
 
 #include <vector>
 
+#define ACC_CLASS(name)
+#define ACC(meta,member) member
+
 #include "keyword.h"
 #include "traits.h"
 #include "dynbuf.h"
@@ -144,11 +141,11 @@
  * So far only used when dealing with artifacts.
  * (now used by alchemy and other code too. Nov 95 b.t).
  */
-typedef struct linked_char {
+struct linked_char
+{
   shstr name;
   struct linked_char *next;
-} linked_char;
-
+};
 
 /* Pull in artifacts */
 #include "artifact.h"
@@ -177,7 +174,7 @@
  * These are the beginnings of linked lists:
  */
 EXTERN player *first_player;
-EXTERN mapstruct *first_map;
+EXTERN maptile *first_map;
 EXTERN region *first_region;
 EXTERN treasurelist *first_treasurelist;
 EXTERN artifactlist *first_artifactlist;
@@ -224,7 +221,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;
@@ -405,15 +401,18 @@
 #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 (maptile *);
 void free (key_value *);
 void free (treasure *);
 void free (materialtype_t *);
 void free (player *);
+void free (New_Face *);
+void free (racelink *);
 
 #endif /* GLOBAL_H */