--- deliantra/server/common/anim.C	2007/02/09 01:52:09	1.20
+++ deliantra/server/common/anim.C	2007/04/12 14:18:04	1.22
@@ -27,148 +27,59 @@
 #include <global.h>
 #include <stdio.h>
 
+animhash_t animhash;
+std::vector<animation> animations;
+
 void
-free_all_anim (void)
+animation::resize (int new_size)
 {
-  for (int i = 0; i <= num_animations; i++)
-    {
-      animations[i].name = 0;
-      free (animations[i].faces);
-    }
-
-  animations.clear ();
+  sfree <faceidx> (faces, num_animations);
+  num_animations = new_size;
+  faces = salloc<faceidx> (num_animations);
 }
 
-void
-init_anim (void)
+animation &
+animation::create (const char *name, uint8 frames, uint8 facings)
 {
-  char
-    buf[MAX_BUF];
-  FILE *
-    fp;
-  static int
-    anim_init = 0;
-  int
-    num_frames = 0, faces[MAX_ANIMATIONS], i;
-
-  if (anim_init)
-    return;
-
-  num_animations = 0;
-  /* Make a default.  New animations start at one, so if something
-   * thinks it is animated but hasn't set the animation_id properly,
-   * it will have a default value that should be pretty obvious.
-   */
-  /* set the name so we don't try to dereferance null.
-   * Put # at start so it will be first in alphabetical
-   * order.
-   */
-  {
-    animation anim0;
-
-    anim0.name = "###none";
-    anim0.num_animations = 1;
-    anim0.faces = (uint16 *)malloc (sizeof (uint16));
-    anim0.faces[0] = 0;
-    anim0.facings = 0;
-
-    animations.push_back (anim0);
-  }
+  animations.push_back (animation ());
+  animation &anim = animations.back ();
 
-  sprintf (buf, "%s/animations", settings.datadir);
-  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));
-      exit (-1);
-    }
-
-  while (fgets (buf, MAX_BUF - 1, fp) != NULL)
-    {
-      if (*buf == '#')
-        continue;
-
-      /* Kill the newline */
-      buf[strlen (buf) - 1] = '\0';
-      if (!strncmp (buf, "anim ", 5))
-        {
-          if (num_frames)
-            {
-              LOG (llevError, "Didn't get a mina before %s\n", buf);
-              num_frames = 0;
-            }
-
-          num_animations++;
-
-          animation anim;
-
-          anim.name = buf + 5;
-          anim.num = num_animations;    /* for bsearch */
-          anim.facings = 1;
-          animations.push_back (anim);
-        }
-      else if (!strncmp (buf, "mina", 4))
-        {
-          animations[num_animations].faces = (uint16 *) malloc (sizeof (uint16) * num_frames);
+  anim.number         = animations.size () - 1;
+  anim.name           = name;
+  anim.num_animations = frames;
+  anim.facings        = facings;
+  anim.faces          = salloc<faceidx> (frames);
 
-          for (i = 0; i < num_frames; i++)
-            animations[num_animations].faces[i] = faces[i];
+  animhash.insert (std::make_pair (anim.name, anim.number));
 
-          animations[num_animations].num_animations = num_frames;
-          if (num_frames % animations[num_animations].facings)
-            {
-              LOG (llevDebug, "Animation %s frame numbers (%d) is not a multiple of facings (%d)\n",
-                   &animations[num_animations].name, num_frames, animations[num_animations].facings);
-            }
-          num_frames = 0;
-        }
-      else if (!strncmp (buf, "facings", 7))
-        {
-          if (!(animations[num_animations].facings = atoi (buf + 7)))
-            {
-              LOG (llevDebug, "Animation %s has 0 facings, line=%s\n", &animations[num_animations].name, buf);
-              animations[num_animations].facings = 1;
-            }
+  return anim;
+}
 
-        }
-      else
-        {
-          if (!(faces[num_frames++] = FindFace (buf, 0)))
-            LOG (llevDebug, "Could not find face %s for animation %s\n", buf, &animations[num_animations].name);
-        }
-    }
+animation &
+animation::find (const char *name)
+{
+  if (!name)
+    return animations [0];
 
-  fclose (fp);
-  LOG (llevDebug, "done. got (%d)\n", num_animations);
+  animhash_t::iterator i = animhash.find (name);
+  return animations [i == animhash.end () ? 0 : i->second];
 }
 
-static int
-anim_compare (const animation *a, const animation *b)
+void
+init_anim (void)
 {
-  return std::strcmp (a->name, b->name);
+  animation &anim0 = animation::create ("none", 1, 0);
+  anim0.faces [0] = 0;
 }
 
 /* Tries to find the animation id that matches name.  Returns an integer match 
  * 0 if no match found (animation 0 is initialised as the 'bug' face
  */
+//TODO: nuke this function and replace all occurences by animations::find
 int
 find_animation (const char *name)
 {
-  animation search, *match;
-
-  search.name = name;
-
-  match = (animation *) bsearch (&search, &animations[0], (num_animations + 1),
-                                  sizeof (animation), (int (*)(const void *, const void *)) anim_compare);
-
-
-  if (match)
-    return match->num;
-
-  LOG (llevError, "Unable to find animation %s\n", name);
-
-  return 0;
+  return animation::find (name).number;
 }
 
 /*
@@ -247,6 +158,7 @@
 
   if (op->face == blank_face)
     op->invisible = 1;
+
   /* This block covers monsters (eg, pixies) which are supposed to
    * cycle from visible to invisible and back to being visible.
    * as such, disable it for players, as then players would become
@@ -254,7 +166,7 @@
    */
   else if (op->type != PLAYER && op->arch->clone.flag [FLAG_ALIVE])
     {
-      if (op->face->number == 0)
+      if (op->face == 0)
         {
           op->invisible = 1;
           CLEAR_FLAG (op, FLAG_ALIVE);
@@ -276,3 +188,4 @@
   if (!op->head)
     update_object (op, UP_OBJ_FACE);
 }
+