ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/anim.C
(Generate patch)

Comparing deliantra/server/common/anim.C (file contents):
Revision 1.12 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.16 by root, Sun Jan 14 23:15:57 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002-2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
… …
72 73
73 animations.push_back (anim0); 74 animations.push_back (anim0);
74 } 75 }
75 76
76 sprintf (buf, "%s/animations", settings.datadir); 77 sprintf (buf, "%s/animations", settings.datadir);
77 LOG (llevDebug, "Reading animations from %s...", buf); 78 LOG (llevDebug, "Reading animations from %s...\n", buf);
78 if ((fp = fopen (buf, "r")) == NULL) 79 if ((fp = fopen (buf, "r")) == NULL)
79 { 80 {
80 LOG (llevError, "Cannot open animations file %s: %s\n", buf, strerror (errno)); 81 LOG (llevError, "Cannot open animations file %s: %s\n", buf, strerror (errno));
81 exit (-1); 82 exit (-1);
82 } 83 }
… …
139{ 140{
140 return strcmp (a->name, b->name); 141 return strcmp (a->name, b->name);
141} 142}
142 143
143/* Tries to find the animation id that matches name. Returns an integer match 144/* Tries to find the animation id that matches name. Returns an integer match
144 * 0 if no match found (animation 0 is initialized as the 'bug' face 145 * 0 if no match found (animation 0 is initialised as the 'bug' face
145 */ 146 */
146int 147int
147find_animation (const char *name) 148find_animation (const char *name)
148{ 149{
149 Animations 150 Animations search, *match;
150 search, *
151 match;
152 151
153 search.name = name; 152 search.name = name;
154 153
155 match = (Animations *) bsearch (&search, &animations[0], (num_animations + 1), 154 match = (Animations *) bsearch (&search, &animations[0], (num_animations + 1),
156 sizeof (Animations), (int (*)(const void *, const void *)) anim_compare); 155 sizeof (Animations), (int (*)(const void *, const void *)) anim_compare);
157 156
158 157
159 if (match) 158 if (match)
160 return match->num; 159 return match->num;
160
161 LOG (llevError, "Unable to find animation %s\n", name); 161 LOG (llevError, "Unable to find animation %s\n", name);
162
162 return 0; 163 return 0;
163} 164}
164 165
165/* 166/*
166 * animate_object(object) updates the face-variable of an object. 167 * animate_object(object) updates the face-variable of an object.
… …
169 * dir is the direction the object is facing. This is generally same as 170 * dir is the direction the object is facing. This is generally same as
170 * op->direction, but in some cases, op->facing is used instead - the 171 * op->direction, but in some cases, op->facing is used instead - the
171 * caller has a better idea which one it really wants to be using, 172 * caller has a better idea which one it really wants to be using,
172 * so let it pass along the right one. 173 * so let it pass along the right one.
173 */ 174 */
174
175void 175void
176animate_object (object *op, int dir) 176animate_object (object *op, int dir)
177{ 177{
178 int max_state; /* Max animation state object should be drawn in */ 178 int max_state; /* Max animation state object should be drawn in */
179 int base_state; /* starting index # to draw from */ 179 int base_state; /* starting index # to draw from */
180 180
181 if (!op->animation_id || !NUM_ANIMATIONS (op)) 181 if (!op->animation_id || !NUM_ANIMATIONS (op))
182 { 182 {
183 LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ()); 183 LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ());
184 CLEAR_FLAG (op, FLAG_ANIMATE);
184 return; 185 return;
185 } 186 }
186 187
187 if (op->head) 188 if (op->head)
188 { 189 {

Diff Legend

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