--- deliantra/server/include/global.h	2009/10/15 21:40:42	1.78
+++ deliantra/server/include/global.h	2010/04/04 04:58:46	1.86
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * 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
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -31,11 +31,17 @@
 #define EXTERN extern
 #endif
 
-#include "includes.h"
+// used only for tagging structure members so scripting languages
+// can easily parse the include files.
+#define INTERFACE_CLASS(name)
+#define ACC(meta,member) member
+#define MTH
+#define GENCONST_IV(patterns)
 
+#include "includes.h"
 #include "config.h"
+#include "compiler.h"
 #include "define.h"
-#include "logger.h"
 
 #ifndef TRUE
 #define TRUE 1
@@ -46,24 +52,13 @@
 #endif
 
 extern short freearr_x[SIZEOFFREE], freearr_y[SIZEOFFREE];
-extern int maxfree[SIZEOFFREE], freedir[SIZEOFFREE];
+extern int freedir[SIZEOFFREE];
 extern int rightof_x[9], rightof_y[9];
 extern int leftof_x[9], leftof_y[9];
 
-// used only for tagging structure members so scripting languages
-// can easily parse the include files.
-#define INTERFACE_CLASS(name)
-#define ACC(meta,member) member
-#define MTH
-
-#if __GNUC__ >= 3
-# define attribute(attrlist) __attribute__(attrlist)
-#else
-# define attribute(attrlist)
-#endif
-
 #include "keyword.h"
 #include "traits.h"
+#include "logger.h"
 #include "dynbuf.h"
 #include "util.h"
 #include "shstr.h"
@@ -148,7 +143,6 @@
 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;
 
 extern dynbuf_text msg_dynbuf; // a dynbuf for text messages and other temporary data
@@ -185,7 +179,7 @@
   const char *ACC (RO, regions);       /* name of the regions file - libdir is prepended */
   const char *ACC (RO, treasures);	    /* location of the treasures file. */
   const char *ACC (RO, uniquedir);	    /* directory for the unique items */
-  const char *ACC (RO, templatedir);   /* directory for the template map */
+  const char *templatedir;   /* directory for the template map */
   const char *ACC (RO, tmpdir);	    /* Directory to use for temporary files */
   sint16  ACC (RW, pk_luck_penalty);    /* Amount by which player luck is reduced if they PK */
   uint8   ACC (RW, stat_loss_on_death);	/* If true, chars lose a random stat when they die */