--- deliantra/server/common/anim.C	2006/09/14 22:33:58	1.10
+++ deliantra/server/common/anim.C	2007/01/06 14:42:28	1.15
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -26,8 +27,6 @@
 #include <global.h>
 #include <stdio.h>
 
-std::vector<Animations> animations;
-
 void
 free_all_anim (void)
 {
@@ -68,7 +67,7 @@
 
     anim0.name = "###none";
     anim0.num_animations = 1;
-    anim0.faces = (Fontindex *) malloc (sizeof (Fontindex));
+    anim0.faces = (uint16 *)malloc (sizeof (uint16));
     anim0.faces[0] = 0;
     anim0.facings = 0;
 
@@ -76,7 +75,7 @@
   }
 
   sprintf (buf, "%s/animations", settings.datadir);
-  LOG (llevDebug, "Reading animations from %s...", buf);
+  LOG (llevDebug, "Reading animations from %s...\n", buf);
   if ((fp = fopen (buf, "r")) == NULL)
     {
       LOG (llevError, "Cannot open animations file %s: %s\n", buf, strerror (errno));
@@ -106,7 +105,7 @@
         }
       else if (!strncmp (buf, "mina", 4))
         {
-          animations[num_animations].faces = (Fontindex *) malloc (sizeof (Fontindex) * num_frames);
+          animations[num_animations].faces = (uint16 *) malloc (sizeof (uint16) * num_frames);
           for (i = 0; i < num_frames; i++)
             animations[num_animations].faces[i] = faces[i];
           animations[num_animations].num_animations = num_frames;
@@ -143,7 +142,7 @@
 }
 
 /* Tries to find the animation id that matches name.  Returns an integer match 
- * 0 if no match found (animation 0 is initialized as the 'bug' face
+ * 0 if no match found (animation 0 is initialised as the 'bug' face
  */
 int
 find_animation (const char *name)
@@ -177,10 +176,8 @@
 void
 animate_object (object *op, int dir)
 {
-  int
-    max_state;                  /* Max animation state object should be drawn in */
-  int
-    base_state;                 /* starting index # to draw from */
+  int max_state;                  /* Max animation state object should be drawn in */
+  int base_state;                 /* starting index # to draw from */
 
   if (!op->animation_id || !NUM_ANIMATIONS (op))
     {