--- deliantra/server/include/global.h	2006/12/15 19:59:19	1.26
+++ deliantra/server/include/global.h	2006/12/22 16:34:00	1.31
@@ -18,7 +18,7 @@
     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-devel@real-time.com
+    The author can be reached via e-mail to crossfire@schmorp.de
 */
 
 #ifndef GLOBAL_H
@@ -64,7 +64,9 @@
 
 /* This blob, in this order, is needed to actually define maps */
 #include "face.h"
-/* Include the basic defines from spells.h */
+
+#include "spells.h"
+
 #include "attack.h" /* needs to be before material.h */
 #include "material.h"
 #include "living.h"
@@ -110,9 +112,6 @@
 /* Now for recipe/alchemy */
 #include "recipe.h"
 
-/* Now for spells */
-#include "spells.h"
-
 #include "funcpoint.h"
 
 /*****************************************************************************
@@ -179,9 +178,8 @@
 /* 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 GET_ANIMATION(ob,anim) (animations[ob->animation_id].faces[anim])
+#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]
 #define GET_ANIM_ID(ob) (ob->animation_id)
 /* NUM_ANIMATIONS returns the number of animations allocated.  The last
  * usuable animation will be NUM_ANIMATIONS-1 (for example, if an object
@@ -245,7 +243,6 @@
   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   ACC (RW, recycle_tmp_maps); /* re-use tmp maps. */
   uint8   ACC (RW, explore_mode);     /* explore mode allowed? */
   uint8   ACC (RW, spellpoint_level_depend); /* spell costs go up with level */
   char    ACC (RW, motd)[MAX_BUF];    /* name of the motd file */