--- deliantra/server/include/global.h	2007/01/15 21:06:19	1.39
+++ deliantra/server/include/global.h	2007/03/06 19:02:35	1.46
@@ -111,13 +111,11 @@
  * GLOBAL VARIABLES:							     *
  *****************************************************************************/
 
-extern New_Face *new_faces;
+extern facetile *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,13 +153,11 @@
 /*
  * 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;
-
-/* 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;
+EXTERN std::vector<animation> animations;
+EXTERN int num_animations, animations_allocated;
+EXTERN uint32_t bmaps_checksum;
 
 #define SET_ANIMATION(ob,newanim) ob->face = new_faces + animations [ob->animation_id].faces [newanim]
 #define GET_ANIMATION(ob,anim) animations [ob->animation_id].faces [anim]
@@ -179,9 +175,8 @@
 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 facetile *blank_face, *empty_face;
+extern facetile *dark_faces[];
 
 extern client *init_sockets;
 
@@ -222,7 +217,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 */