--- deliantra/server/include/global.h	2007/05/07 04:21:11	1.58
+++ deliantra/server/include/global.h	2008/04/20 00:44:12	1.70
@@ -1,25 +1,24 @@
 /*
- * CrossFire, A Multiplayer game
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * 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 Deliantra 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
+ * Deliantra 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 <support@deliantra.net>
  */
 
 #ifndef GLOBAL_H
@@ -45,6 +44,11 @@
 #define FALSE 0
 #endif
 
+extern short freearr_x[SIZEOFFREE], freearr_y[SIZEOFFREE];
+extern int maxfree[SIZEOFFREE], freedir[SIZEOFFREE];
+extern int rightof_x[9], rightof_y[9];
+extern int leftof_x[9], leftof_y[9];
+
 // used only for tagging structure members so scripting languages
 // can easily parse the include files.
 #define INTERFACE_CLASS(name)
@@ -62,9 +66,11 @@
 #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"
+#include "sounds.h"
 
 #include "spells.h"
 
@@ -124,7 +130,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;
@@ -141,19 +146,11 @@
 /*
  * Misc global variables:
  */
-EXTERN FILE *logfile;			/* Used by server/daemon.c */
-
-EXTERN archetype *empty_archetype;	/* Nice to have fast access to it */
-EXTERN archetype *map_archeytpe;
 EXTERN shstr first_map_path;	/* The start-level */
 EXTERN shstr first_map_ext_path; /* Path used for per-race start maps */
 
 EXTERN char errmsg[HUGE_BUF];
 EXTERN long ob_count;
-/*
- * Used in treasure.c
- */
-EXTERN archetype *ring_arch, *amulet_arch, *staff_arch, *crown_arch;
 
 #define SET_ANIMATION(ob,newanim) ob->face = animations [ob->animation_id].faces [newanim]
 #define GET_ANIMATION(ob,anim) animations [ob->animation_id].faces [anim]
@@ -166,13 +163,10 @@
 #define NUM_ANIMATIONS(ob) (animations[ob->animation_id].num_animations)
 #define NUM_FACINGS(ob) (animations[ob->animation_id].facings)
 
-extern short freearr_x[SIZEOFFREE], freearr_y[SIZEOFFREE];
-extern int maxfree[SIZEOFFREE], freedir[SIZEOFFREE];
-extern int rightof_x[9], rightof_y[9];
-extern int leftof_x[9], leftof_y[9];
+// used only by treasure.C, does not handle null arch ptrs
+#define IS_ARCH(arch,name) ((arch)->archname == shstr_ ## name)
 
 extern void emergency_save ();
-extern void cleanup (const char *cause, bool make_core = false);
 
 #include "libproto.h"
 #include "sockproto.h"
@@ -214,8 +208,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 */
@@ -240,16 +234,11 @@
   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 */