--- deliantra/server/include/global.h	2007/03/18 03:05:40	1.49
+++ deliantra/server/include/global.h	2007/05/17 14:14:55	1.59
@@ -1,5 +1,5 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  * 
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -25,7 +25,7 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
-#define _GLIBCXX_CONCEPT_CHECKS
+//#define _GLIBCXX_CONCEPT_CHECKS
 
 #ifndef EXTERN
 #define EXTERN extern
@@ -51,6 +51,12 @@
 #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"
@@ -66,6 +72,7 @@
 #include "material.h"
 #include "living.h"
 #include "object.h"
+#include "region.h"
 #include "map.h"
 #include "tod.h"
 
@@ -116,7 +123,6 @@
 /*
  * These are the beginnings of linked lists:
  */
-EXTERN treasurelist *first_treasurelist;
 EXTERN artifactlist *first_artifactlist;
 EXTERN archetype *first_archetype;
 EXTERN objectlink *first_friendly_object;	/* Objects monsters will go after */
@@ -127,21 +133,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;
@@ -155,10 +155,6 @@
  */
 EXTERN archetype *ring_arch, *amulet_arch, *staff_arch, *crown_arch;
 
-EXTERN std::vector<animation> animations;
-EXTERN int num_animations, animations_allocated;
-EXTERN uint32_t bmaps_checksum;
-
 #define SET_ANIMATION(ob,newanim) ob->face = animations [ob->animation_id].faces [newanim]
 #define GET_ANIMATION(ob,anim) animations [ob->animation_id].faces [anim]
 #define GET_ANIM_ID(ob) (ob->animation_id)
@@ -218,8 +214,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 */
@@ -244,12 +240,12 @@
   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"