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.10 by root, Thu Sep 14 22:33:58 2006 UTC vs.
Revision 1.20 by root, Fri Feb 9 01:52:09 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* This file contains animation related code. */ 25/* This file contains animation related code. */
25 26
26#include <global.h> 27#include <global.h>
27#include <stdio.h> 28#include <stdio.h>
28
29std::vector<Animations> animations;
30 29
31void 30void
32free_all_anim (void) 31free_all_anim (void)
33{ 32{
34 for (int i = 0; i <= num_animations; i++) 33 for (int i = 0; i <= num_animations; i++)
… …
52 int 51 int
53 num_frames = 0, faces[MAX_ANIMATIONS], i; 52 num_frames = 0, faces[MAX_ANIMATIONS], i;
54 53
55 if (anim_init) 54 if (anim_init)
56 return; 55 return;
56
57 num_animations = 0; 57 num_animations = 0;
58 /* Make a default. New animations start at one, so if something 58 /* Make a default. New animations start at one, so if something
59 * thinks it is animated but hasn't set the animation_id properly, 59 * thinks it is animated but hasn't set the animation_id properly,
60 * it will have a default value that should be pretty obvious. 60 * it will have a default value that should be pretty obvious.
61 */ 61 */
62 /* set the name so we don't try to dereferance null. 62 /* set the name so we don't try to dereferance null.
63 * Put # at start so it will be first in alphabetical 63 * Put # at start so it will be first in alphabetical
64 * order. 64 * order.
65 */ 65 */
66 { 66 {
67 Animations anim0; 67 animation anim0;
68 68
69 anim0.name = "###none"; 69 anim0.name = "###none";
70 anim0.num_animations = 1; 70 anim0.num_animations = 1;
71 anim0.faces = (Fontindex *) malloc (sizeof (Fontindex)); 71 anim0.faces = (uint16 *)malloc (sizeof (uint16));
72 anim0.faces[0] = 0; 72 anim0.faces[0] = 0;
73 anim0.facings = 0; 73 anim0.facings = 0;
74 74
75 animations.push_back (anim0); 75 animations.push_back (anim0);
76 } 76 }
77 77
78 sprintf (buf, "%s/animations", settings.datadir); 78 sprintf (buf, "%s/animations", settings.datadir);
79 LOG (llevDebug, "Reading animations from %s...", buf); 79 LOG (llevDebug, "Reading animations from %s...\n", buf);
80
80 if ((fp = fopen (buf, "r")) == NULL) 81 if ((fp = fopen (buf, "r")) == NULL)
81 { 82 {
82 LOG (llevError, "Cannot open animations file %s: %s\n", buf, strerror (errno)); 83 LOG (llevError, "Cannot open animations file %s: %s\n", buf, strerror (errno));
83 exit (-1); 84 exit (-1);
84 } 85 }
86
85 while (fgets (buf, MAX_BUF - 1, fp) != NULL) 87 while (fgets (buf, MAX_BUF - 1, fp) != NULL)
86 { 88 {
87 if (*buf == '#') 89 if (*buf == '#')
88 continue; 90 continue;
91
89 /* Kill the newline */ 92 /* Kill the newline */
90 buf[strlen (buf) - 1] = '\0'; 93 buf[strlen (buf) - 1] = '\0';
91 if (!strncmp (buf, "anim ", 5)) 94 if (!strncmp (buf, "anim ", 5))
92 { 95 {
93 if (num_frames) 96 if (num_frames)
94 { 97 {
95 LOG (llevError, "Didn't get a mina before %s\n", buf); 98 LOG (llevError, "Didn't get a mina before %s\n", buf);
96 num_frames = 0; 99 num_frames = 0;
97 } 100 }
101
98 num_animations++; 102 num_animations++;
99 103
100 Animations anim; 104 animation anim;
101 105
102 anim.name = buf + 5; 106 anim.name = buf + 5;
103 anim.num = num_animations; /* for bsearch */ 107 anim.num = num_animations; /* for bsearch */
104 anim.facings = 1; 108 anim.facings = 1;
105 animations.push_back (anim); 109 animations.push_back (anim);
106 } 110 }
107 else if (!strncmp (buf, "mina", 4)) 111 else if (!strncmp (buf, "mina", 4))
108 { 112 {
109 animations[num_animations].faces = (Fontindex *) malloc (sizeof (Fontindex) * num_frames); 113 animations[num_animations].faces = (uint16 *) malloc (sizeof (uint16) * num_frames);
114
110 for (i = 0; i < num_frames; i++) 115 for (i = 0; i < num_frames; i++)
111 animations[num_animations].faces[i] = faces[i]; 116 animations[num_animations].faces[i] = faces[i];
117
112 animations[num_animations].num_animations = num_frames; 118 animations[num_animations].num_animations = num_frames;
113 if (num_frames % animations[num_animations].facings) 119 if (num_frames % animations[num_animations].facings)
114 { 120 {
115 LOG (llevDebug, "Animation %s frame numbers (%d) is not a multiple of facings (%d)\n", 121 LOG (llevDebug, "Animation %s frame numbers (%d) is not a multiple of facings (%d)\n",
116 &animations[num_animations].name, num_frames, animations[num_animations].facings); 122 &animations[num_animations].name, num_frames, animations[num_animations].facings);
… …
130 { 136 {
131 if (!(faces[num_frames++] = FindFace (buf, 0))) 137 if (!(faces[num_frames++] = FindFace (buf, 0)))
132 LOG (llevDebug, "Could not find face %s for animation %s\n", buf, &animations[num_animations].name); 138 LOG (llevDebug, "Could not find face %s for animation %s\n", buf, &animations[num_animations].name);
133 } 139 }
134 } 140 }
141
135 fclose (fp); 142 fclose (fp);
136 LOG (llevDebug, "done. got (%d)\n", num_animations); 143 LOG (llevDebug, "done. got (%d)\n", num_animations);
137} 144}
138 145
139static int 146static int
140anim_compare (const Animations * a, const Animations * b) 147anim_compare (const animation *a, const animation *b)
141{ 148{
142 return strcmp (a->name, b->name); 149 return std::strcmp (a->name, b->name);
143} 150}
144 151
145/* Tries to find the animation id that matches name. Returns an integer match 152/* Tries to find the animation id that matches name. Returns an integer match
146 * 0 if no match found (animation 0 is initialized as the 'bug' face 153 * 0 if no match found (animation 0 is initialised as the 'bug' face
147 */ 154 */
148int 155int
149find_animation (const char *name) 156find_animation (const char *name)
150{ 157{
151 Animations 158 animation search, *match;
152 search, *
153 match;
154 159
155 search.name = name; 160 search.name = name;
156 161
157 match = (Animations *) bsearch (&search, &animations[0], (num_animations + 1), 162 match = (animation *) bsearch (&search, &animations[0], (num_animations + 1),
158 sizeof (Animations), (int (*)(const void *, const void *)) anim_compare); 163 sizeof (animation), (int (*)(const void *, const void *)) anim_compare);
159 164
160 165
161 if (match) 166 if (match)
162 return match->num; 167 return match->num;
168
163 LOG (llevError, "Unable to find animation %s\n", name); 169 LOG (llevError, "Unable to find animation %s\n", name);
170
164 return 0; 171 return 0;
165} 172}
166 173
167/* 174/*
168 * animate_object(object) updates the face-variable of an object. 175 * animate_object(object) updates the face-variable of an object.
… …
171 * dir is the direction the object is facing. This is generally same as 178 * dir is the direction the object is facing. This is generally same as
172 * op->direction, but in some cases, op->facing is used instead - the 179 * op->direction, but in some cases, op->facing is used instead - the
173 * caller has a better idea which one it really wants to be using, 180 * caller has a better idea which one it really wants to be using,
174 * so let it pass along the right one. 181 * so let it pass along the right one.
175 */ 182 */
176
177void 183void
178animate_object (object *op, int dir) 184animate_object (object *op, int dir)
179{ 185{
180 int
181 max_state; /* Max animation state object should be drawn in */ 186 int max_state; /* Max animation state object should be drawn in */
182 int
183 base_state; /* starting index # to draw from */ 187 int base_state; /* starting index # to draw from */
184 188
185 if (!op->animation_id || !NUM_ANIMATIONS (op)) 189 if (!op->animation_id || !NUM_ANIMATIONS (op))
186 { 190 {
187 LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ()); 191 LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ());
192 CLEAR_FLAG (op, FLAG_ANIMATE);
188 return; 193 return;
189 } 194 }
190 195
191 if (op->head) 196 if (op->head)
192 { 197 {
… …
203 /* If object is turning, then max animation state is half through the 208 /* If object is turning, then max animation state is half through the
204 * animations. Otherwise, we can use all the animations. 209 * animations. Otherwise, we can use all the animations.
205 */ 210 */
206 max_state = NUM_ANIMATIONS (op) / NUM_FACINGS (op); 211 max_state = NUM_ANIMATIONS (op) / NUM_FACINGS (op);
207 base_state = 0; 212 base_state = 0;
208 /* at least in the older aniamtions that used is_turning, the first half 213 /* at least in the older animations that used is_turning, the first half
209 * of the animations were left facing, the second half right facing. 214 * of the animations were left facing, the second half right facing.
210 * Note in old the is_turning, it was set so that the animation for a monster 215 * Note in old the is_turning, it was set so that the animation for a monster
211 * was always towards the enemy - now it is whatever direction the monster 216 * was always towards the enemy - now it is whatever direction the monster
212 * is facing. 217 * is facing.
213 */ 218 */
… …
240 245
241 SET_ANIMATION (op, op->state + base_state); 246 SET_ANIMATION (op, op->state + base_state);
242 247
243 if (op->face == blank_face) 248 if (op->face == blank_face)
244 op->invisible = 1; 249 op->invisible = 1;
245
246 /* This block covers monsters (eg, pixies) which are supposed to 250 /* This block covers monsters (eg, pixies) which are supposed to
247 * cycle from visible to invisible and back to being visible. 251 * cycle from visible to invisible and back to being visible.
248 * as such, disable it for players, as then players would become 252 * as such, disable it for players, as then players would become
249 * visible. 253 * visible.
250 */ 254 */
251 else if (op->type != PLAYER && QUERY_FLAG ((&op->arch->clone), FLAG_ALIVE)) 255 else if (op->type != PLAYER && op->arch->clone.flag [FLAG_ALIVE])
252 { 256 {
253 if (op->face->number == 0) 257 if (op->face->number == 0)
254 { 258 {
255 op->invisible = 1; 259 op->invisible = 1;
256 CLEAR_FLAG (op, FLAG_ALIVE); 260 CLEAR_FLAG (op, FLAG_ALIVE);

Diff Legend

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