--- deliantra/server/include/global.h	2009/10/15 21:40:42	1.78
+++ deliantra/server/include/global.h	2011/02/26 11:34:32	1.91
@@ -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,18 @@
 #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"
+#include "traits.h"
 
 #ifndef TRUE
 #define TRUE 1
@@ -46,26 +53,17 @@
 #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
+extern sint64 levels [MAXNUMLEVELS];
 
 #include "keyword.h"
-#include "traits.h"
+#include "logger.h"
 #include "dynbuf.h"
 #include "util.h"
+#include "rng.h"
 #include "shstr.h"
 #include "cfperl.h"
 
@@ -76,7 +74,7 @@
 #include "spells.h"
 
 #include "attack.h" /* needs to be before material.h */
-#include "material.h"
+#include "material.h" /* needs to be before freezethaw.h */
 #include "living.h"
 #include "object.h"
 #include "region.h"
@@ -95,8 +93,6 @@
 /* pull in treasure structure */
 #include "treasure.h"
 
-#include "commands.h"
-
 /* pull in book structures */
 #include "book.h"
 /*
@@ -148,7 +144,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
@@ -169,11 +164,7 @@
 INTERFACE_CLASS (Settings)
 struct Settings {
   const char *ACC (RO, logfilename);   /* logfile to use */
-  int     ACC (RW, csport);	    /* port for new client/server */
   int     ACC (RW, debug);	    /* Default debugging level */
-  uint8   dumpvalues;	    /* Set to dump various values/tables */
-  const char *dumparg;       /* additional argument for some dump functions */
-  uint8   daemonmode;     /* If true, detach and become daemon */
   int	    argc;	    /* parameters that were passed to the program */
   char    **argv;	    /* Only used by xio.c, so will go away at some time */
   const char *ACC (RO, confdir);	    /* configuration files */
@@ -182,10 +173,9 @@
   const char *ACC (RO, playerdir);	    /* Where the player files are */
   const char *ACC (RO, mapdir);	    /* Where the map files are */
   const char *ACC (RO, archetypes);    /* name of the archetypes file - libdir is prepended */
-  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 */
@@ -201,9 +191,6 @@
   uint8   ACC (RW, spell_encumbrance); /* encumbrance effects spells */
   uint8   ACC (RW, spell_failure_effects); /* nasty backlash to spell failures */
   uint16  ACC (RW, set_friendly_fire);	/* Percent of damage done by peaceful player vs player damage */
-  uint8   dummy_001;
-  uint8   dummy_002;
-  uint8   dummy_000;
   uint8   ACC (RW, spellpoint_level_depend); /* spell costs go up with level */
 
   int     ACC (RW, max_level);		    /* This is read out of exp_table */