--- deliantra/server/include/global.h	2007/01/07 02:39:14	1.38
+++ deliantra/server/include/global.h	2007/03/11 02:12:44	1.47
@@ -1,26 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
-    Copyright (C) 2002 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program 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
-    (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 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
-*/
+ * CrossFire, A Multiplayer game for X-windows
+ * 
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (C) 1992 Frank Tore Johansen
+ * 
+ * This program 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
+ * (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 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
+ */
 
 #ifndef GLOBAL_H
 #define GLOBAL_H
@@ -111,13 +111,9 @@
  * GLOBAL VARIABLES:							     *
  *****************************************************************************/
 
-extern New_Face *new_faces;
-
 /*
  * These are the beginnings of linked lists:
  */
-EXTERN player *first_player;
-EXTERN region *first_region;
 EXTERN treasurelist *first_treasurelist;
 EXTERN artifactlist *first_artifactlist;
 EXTERN archetype *first_archetype;
@@ -155,15 +151,13 @@
 /*
  * Used in treasure.c
  */
-EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch;
+EXTERN archetype *ring_arch, *amulet_arch, *staff_arch, *crown_arch;
 
-EXTERN std::vector<Animations> animations;
-EXTERN int num_animations,animations_allocated, bmaps_checksum;
+EXTERN std::vector<animation> animations;
+EXTERN int num_animations, animations_allocated;
+EXTERN uint32_t bmaps_checksum;
 
-/* Rotate right from bsd sum. This is used in various places for checksumming */
-#define ROTATE_RIGHT(c) if ((c) & 01) (c) = ((c) >>1) + 0x80000000; else (c) >>= 1;
-
-#define SET_ANIMATION(ob,newanim) ob->face = new_faces + animations [ob->animation_id].faces [newanim]
+#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)
 /* NUM_ANIMATIONS returns the number of animations allocated.  The last
@@ -179,12 +173,6 @@
 extern int rightof_x[9], rightof_y[9];
 extern int leftof_x[9], leftof_y[9];
 
-extern New_Face *blank_face, *empty_face;
-extern New_Face *dark_faces[];
-extern New_Face *smooth_face;
-
-extern client *init_sockets;
-
 extern void emergency_save ();
 extern void cleanup (const char *cause, bool make_core = false);
 
@@ -222,7 +210,6 @@
   uint8   ACC (RW, balanced_stat_loss); /* If true, Death stat depletion based on level etc */
   uint8   ACC (RW, not_permadeth);  /* if true, death is non-permament */
   uint8   ACC (RW, simple_exp);	    /* If true, use the simple experience system */
-  int	  ACC (RW, reset_loc_time); /* Number of seconds to put player back at home */
   uint8   ACC (RW, set_title);	    /* players can set thier title */
   uint8   ACC (RW, resurrection);   /* ressurection possible w/ permadeth on */
   uint8   ACC (RW, search_items);   /* search_items command */