--- deliantra/server/include/global.h	2010/01/31 03:46:20	1.83
+++ deliantra/server/include/global.h	2012/10/29 23:55:53	1.97
@@ -1,24 +1,24 @@
 /*
  * 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,2011,2012 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
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the Affero GNU General Public License
  * and the GNU General Public License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
- * 
+ *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
@@ -31,10 +31,18 @@
 #define EXTERN extern
 #endif
 
+// 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 "traits.h"
 
 #ifndef TRUE
 #define TRUE 1
@@ -49,17 +57,13 @@
 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
+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"
 
@@ -70,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"
@@ -89,10 +93,11 @@
 /* pull in treasure structure */
 #include "treasure.h"
 
-#include "commands.h"
-
 /* pull in book structures */
 #include "book.h"
+
+#include "quadland.h"
+
 /*
  * So far only used when dealing with artifacts.
  * (now used by alchemy and other code too. Nov 95 b.t).
@@ -134,7 +139,7 @@
 EXTERN bool init_done;		/* Ignores signals until init_done is true */
 EXTERN bool in_cleanup;		/* True when cleanup() is reached */
 
-extern tick_t pticks;		/* used by various function to determine */
+extern tick_t server_tick;	/* used by various function to determine */
                                 /* how often to save the character */
 /*
  * Misc global variables:
@@ -162,23 +167,15 @@
 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 */
+  int         ACC (RW, debug);	    /* Default debugging level */
+  int	    argc;
+  char    **argv;
   const char *ACC (RO, confdir);	    /* configuration files */
   const char *ACC (RO, datadir);	    /* read only data files */
   const char *ACC (RO, localdir);	    /* read/write data files */
   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 *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 */
@@ -194,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 */