[ViewVC] Diff of: cvs/deliantra/server/common/anim.C

Comparing deliantra/server/common/anim.C (file contents):
Revision 1.9 by root, Tue Sep 12 19:20:05 2006 UTC vs.
Revision 1.20 by root, Fri Feb 9 01:52:09 2007 UTC

 /*
- * static char *rcsid_anim_c =
+ * CrossFire, A Multiplayer game for X-windows
- *   "$Id: anim.C,v 1.9 2006/09/12 19:20:05 root Exp $";
+ *
+ * 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
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * The authors can be reached via e-mail at <crossfire@schmorp.de>
  */
-/*
-    CrossFire, A Multiplayer game for X-windows
-    Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
-    Copyright (C) 1992 Frank Tore Johansen
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
-*/
 /* This file contains animation related code. */
 #include <global.h>
 #include <stdio.h>
-std::vector < Animations > animations;
 void
 free_all_anim (void)
 {
   for (int i = 0; i <= num_animations; i++)
   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.
    */
   {
-    Animations anim0;
+    animation anim0;
     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;
     animations.push_back (anim0);
   }
   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));
       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++;
-          Animations anim;
+          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 = (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;
           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);
         {
           if (!(faces[num_frames++] = FindFace (buf, 0)))
             LOG (llevDebug, "Could not find face %s for animation %s\n", buf, &animations[num_animations].name);
         }
     }
   fclose (fp);
   LOG (llevDebug, "done. got (%d)\n", num_animations);
 }
 static int
-anim_compare (const Animations * a, const Animations * b)
+anim_compare (const animation *a, const animation *b)
 {
-  return strcmp (a->name, b->name);
+  return std::strcmp (a->name, b->name);
 }
 /* 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)
 {
-  Animations
+  animation search, *match;
-  search, *
-    match;
   search.name = name;
-  match = (Animations *) bsearch (&search, &animations[0], (num_animations + 1),
+  match = (animation *) bsearch (&search, &animations[0], (num_animations + 1),
-                                  sizeof (Animations), (int (*)(const void *, const void *)) anim_compare);
+                                  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;
 }
 /*
  * animate_object(object) updates the face-variable of an object.
  * dir is the direction the object is facing.  This is generally same as
  *    op->direction, but in some cases, op->facing is used instead - the
  *    caller has a better idea which one it really wants to be using,
  *    so let it pass along the right one.
  */
 void
 animate_object (object *op, int dir)
 {
-  int
-    max_state;                  /* Max animation state object should be drawn in */
+  int max_state;                  /* Max animation state object should be drawn in */
-  int
-    base_state;                 /* starting index # to draw from */
+  int base_state;                 /* starting index # to draw from */
   if (!op->animation_id || !NUM_ANIMATIONS (op))
     {
       LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ());
+      CLEAR_FLAG (op, FLAG_ANIMATE);
       return;
     }
   if (op->head)
     {
   /* If object is turning, then max animation state is half through the
    * animations.  Otherwise, we can use all the animations.
    */
   max_state = NUM_ANIMATIONS (op) / NUM_FACINGS (op);
   base_state = 0;
-  /* at least in the older aniamtions that used is_turning, the first half
+  /* at least in the older animations that used is_turning, the first half
    * of the animations were left facing, the second half right facing.
    * Note in old the is_turning, it was set so that the animation for a monster
    * was always towards the enemy - now it is whatever direction the monster
    * is facing.
    */
   SET_ANIMATION (op, op->state + base_state);
   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
    * visible.
    */
-  else if (op->type != PLAYER && QUERY_FLAG ((&op->arch->clone), FLAG_ALIVE))
+  else if (op->type != PLAYER && op->arch->clone.flag [FLAG_ALIVE])
     {
       if (op->face->number == 0)
         {
           op->invisible = 1;
           CLEAR_FLAG (op, FLAG_ALIVE);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/anim.C (file contents): Revision 1.9 by root, Tue Sep 12 19:20:05 2006 UTC vs. Revision 1.20 by root, Fri Feb 9 01:52:09 2007 UTC

Diff Legend

Comparing deliantra/server/common/anim.C (file contents):
Revision 1.9 by root, Tue Sep 12 19:20:05 2006 UTC vs.
Revision 1.20 by root, Fri Feb 9 01:52:09 2007 UTC