--- deliantra/server/include/global.h	2006/12/18 02:35:01	1.29
+++ deliantra/server/include/global.h	2006/12/22 16:34:00	1.31
@@ -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