--- deliantra/server/include/global.h	2006/09/11 01:49:03	1.16
+++ deliantra/server/include/global.h	2006/10/15 02:16:35	1.19
@@ -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
@@ -146,10 +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"
@@ -178,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;
@@ -410,7 +406,9 @@
 void free (recipe *);
 void free (linked_char *);
 void free (godlink *);
-void free (mapstruct *);
+void free (objectlink *);
+void free (oblinkpt *);
+void free (maptile *);
 void free (key_value *);
 void free (treasure *);
 void free (materialtype_t *);