--- deliantra/server/include/global.h	2007/04/16 06:23:41	1.52
+++ deliantra/server/include/global.h	2007/07/01 05:00:18	1.63
@@ -1,25 +1,24 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The author can be reached via e-mail to crossfire@schmorp.de
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 #ifndef GLOBAL_H
@@ -51,11 +50,18 @@
 #define ACC(meta,member) member
 #define MTH
 
+#if __GNUC__ >= 3
+# define attribute(attrlist) __attribute__(attrlist)
+#else
+# define attribute(attrlist)
+#endif
+
 #include "keyword.h"
 #include "traits.h"
 #include "dynbuf.h"
 #include "util.h"
 #include "shstr.h"
+#include "cfperl.h"
 
 /* This blob, in this order, is needed to actually define maps */
 #include "face.h"
@@ -66,6 +72,7 @@
 #include "material.h"
 #include "living.h"
 #include "object.h"
+#include "region.h"
 #include "map.h"
 #include "tod.h"
 
@@ -117,7 +124,6 @@
  * These are the beginnings of linked lists:
  */
 EXTERN artifactlist *first_artifactlist;
-EXTERN archetype *first_archetype;
 EXTERN objectlink *first_friendly_object;	/* Objects monsters will go after */
 EXTERN godlink *first_god;
 EXTERN racelink *first_race;
@@ -126,21 +132,15 @@
  * Variables set by different flags (see init.c):
  */
 
-EXTERN bool warn_archetypes;	/* If true, write warnings when failing */
-                                /* to find archetypes when loading from file */
 EXTERN bool init_done;		/* Ignores signals until init_done is true */
 EXTERN bool in_cleanup;		/* True when cleanup() is reached */
 
-extern long pticks;		/* used by various function to determine */
+extern tick_t pticks;		/* used by various function to determine */
                                 /* how often to save the character */
 /*
  * Misc global variables:
  */
 EXTERN FILE *logfile;			/* Used by server/daemon.c */
-EXTERN int exiting;			/* True if the game is about to exit */
-EXTERN long nroftreasures;		/* Only used in malloc_info() */
-EXTERN long nrofartifacts;		/* Only used in malloc_info() */
-EXTERN long nrofallowedstr;		/* Only used in malloc_info() */
 
 EXTERN archetype *empty_archetype;	/* Nice to have fast access to it */
 EXTERN archetype *map_archeytpe;
@@ -213,8 +213,8 @@
   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   ACC (RW, casting_time);   /* it takes awhile to cast a spell */
-  uint8   ACC (RW, real_wiz);       /* use mud-like wizards */
+  uint8   dummy_001;
+  uint8   dummy_002;
   uint8   dummy_000;
   uint8   ACC (RW, spellpoint_level_depend); /* spell costs go up with level */
   char ACC (RW, motd)[MAX_BUF];    /* name of the motd file */
@@ -239,14 +239,13 @@
   int     ACC (RW, armor_speed_improvement);    /* Speed improvement */
   uint8   ACC (RW, armor_weight_linear);  /* If 1, weight reduction is linear, else exponantiel */
   uint8   ACC (RW, armor_speed_linear);         /* If 1, speed improvement is linear, else exponantiel */
-  uint8   ACC (RW, no_player_stealing);     /* If 1, can not steal from other players */
-  uint8   ACC (RW, create_home_portals);   /* If 1, can create portals in personal maps */
 };
 
 extern Settings settings;
 
+void reset_signals ();
+
 #include "plugin.h"
-#include "cfperl.h"
 
 #endif /* GLOBAL_H */