--- deliantra/server/common/anim.C 2006/09/10 16:00:23 1.7 +++ deliantra/server/common/anim.C 2007/01/19 17:50:10 1.18 @@ -1,39 +1,32 @@ - /* - * static char *rcsid_anim_c = - * "$Id: anim.C,v 1.7 2006/09/10 16:00:23 root Exp $"; + * 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 + * + * 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, 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 #include -std::vector < Animations > animations; - void free_all_anim (void) { @@ -70,12 +63,11 @@ * 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; @@ -83,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)); @@ -104,8 +96,7 @@ } num_animations++; - Animations - anim; + animation anim; anim.name = buf + 5; anim.num = num_animations; /* for bsearch */ @@ -114,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; @@ -145,30 +136,30 @@ } static int -anim_compare (const Animations * a, const Animations * b) +anim_compare (const animation * a, const animation * b) { return 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 - search, * - match; + animation search, *match; search.name = name; - match = (Animations *) bsearch (&search, &animations[0], (num_animations + 1), - sizeof (Animations), (int (*)(const void *, const void *)) anim_compare); + 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; } @@ -181,21 +172,19 @@ * 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 - 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)) { - LOG (llevError, "Object lacks animation.\n"); - dump_object (op); + LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ()); + CLEAR_FLAG (op, FLAG_ANIMATE); return; } + if (op->head) { dir = op->head->direction; @@ -206,9 +195,7 @@ ++op->state; } else - { - ++op->state; /* increase draw state */ - } + ++op->state; /* increase draw state */ /* If object is turning, then max animation state is half through the * animations. Otherwise, we can use all the animations. @@ -221,6 +208,7 @@ * was always towards the enemy - now it is whatever direction the monster * is facing. */ + if (NUM_FACINGS (op) == 2) { if (dir < 5)