--- deliantra/server/include/global.h 2010/07/02 02:00:47 1.90
+++ deliantra/server/include/global.h 2017/09/16 22:17:42 1.99
@@ -1,24 +1,24 @@
/*
* 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 (©) 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
* .
- *
+ *
* The authors can be reached via e-mail to
*/
@@ -52,7 +52,8 @@
#define FALSE 0
#endif
-extern short freearr_x[SIZEOFFREE], freearr_y[SIZEOFFREE];
+extern short freearr_x[SIZEOFFREE];
+extern short 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 +96,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 +140,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:
@@ -164,23 +168,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 */
@@ -196,9 +192,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 */