--- deliantra/server/include/global.h	2010/04/06 22:59:28	1.87
+++ deliantra/server/include/global.h	2011/02/26 12:50:27	1.92
@@ -42,6 +42,7 @@
 #include "config.h"
 #include "compiler.h"
 #include "define.h"
+#include "traits.h"
 
 #ifndef TRUE
 #define TRUE 1
@@ -56,11 +57,13 @@
 extern int rightof_x[9], rightof_y[9];
 extern int leftof_x[9], leftof_y[9];
 
+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"
 
@@ -71,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"
@@ -161,23 +164,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 */
@@ -193,9 +188,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 */