--- deliantra/server/include/global.h	2011/02/26 11:34:32	1.91
+++ deliantra/server/include/global.h	2018/11/18 15:19:48	1.102
@@ -1,24 +1,25 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
- * 
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 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>
  */
 
@@ -52,7 +53,8 @@
 #define FALSE 0
 #endif
 
-extern short freearr_x[SIZEOFFREE], freearr_y[SIZEOFFREE];
+extern int freearr_x[SIZEOFFREE];
+extern int freearr_y[SIZEOFFREE];
 extern int freedir[SIZEOFFREE];
 extern int rightof_x[9], rightof_y[9];
 extern int leftof_x[9], leftof_y[9];
@@ -95,6 +97,9 @@
 
 /* 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).
@@ -136,7 +141,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:
@@ -148,14 +153,6 @@
 
 extern dynbuf_text msg_dynbuf; // a dynbuf for text messages and other temporary data
 
-/* do not use these in new code, see object.h::animation */
-#define SET_ANIMATION(ob,frame) ob->set_anim_frame (frame)
-#define NUM_ANIMATIONS(ob) (ob)->anim_frames ()
-#define NUM_FACINGS(ob)    (ob)->anim_facings ()
-
-// used only by treasure.C, does not handle null arch ptrs
-#define IS_ARCH(arch,name) ((arch)->archname == shstr_ ## name)
-
 extern void emergency_save ();
 
 #include "libproto.h"
@@ -164,18 +161,15 @@
 INTERFACE_CLASS (Settings)
 struct Settings {
   const char *ACC (RO, logfilename);   /* logfile to use */
-  int     ACC (RW, debug);	    /* Default debugging level */
-  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, 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 */