| … | |
… | |
| 145 | * 0 if no match found (animation 0 is initialised as the 'bug' face |
145 | * 0 if no match found (animation 0 is initialised as the 'bug' face |
| 146 | */ |
146 | */ |
| 147 | int |
147 | int |
| 148 | find_animation (const char *name) |
148 | find_animation (const char *name) |
| 149 | { |
149 | { |
| 150 | Animations |
150 | Animations search, *match; |
| 151 | search, * |
|
|
| 152 | match; |
|
|
| 153 | |
151 | |
| 154 | search.name = name; |
152 | search.name = name; |
| 155 | |
153 | |
| 156 | match = (Animations *) bsearch (&search, &animations[0], (num_animations + 1), |
154 | match = (Animations *) bsearch (&search, &animations[0], (num_animations + 1), |
| 157 | sizeof (Animations), (int (*)(const void *, const void *)) anim_compare); |
155 | sizeof (Animations), (int (*)(const void *, const void *)) anim_compare); |
| 158 | |
156 | |
| 159 | |
157 | |
| 160 | if (match) |
158 | if (match) |
| 161 | return match->num; |
159 | return match->num; |
|
|
160 | |
| 162 | LOG (llevError, "Unable to find animation %s\n", name); |
161 | LOG (llevError, "Unable to find animation %s\n", name); |
|
|
162 | |
| 163 | return 0; |
163 | return 0; |
| 164 | } |
164 | } |
| 165 | |
165 | |
| 166 | /* |
166 | /* |
| 167 | * animate_object(object) updates the face-variable of an object. |
167 | * animate_object(object) updates the face-variable of an object. |
| … | |
… | |
| 170 | * 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 |
| 171 | * 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 |
| 172 | * 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, |
| 173 | * so let it pass along the right one. |
173 | * so let it pass along the right one. |
| 174 | */ |
174 | */ |
| 175 | |
|
|
| 176 | void |
175 | void |
| 177 | animate_object (object *op, int dir) |
176 | animate_object (object *op, int dir) |
| 178 | { |
177 | { |
| 179 | int max_state; /* Max animation state object should be drawn in */ |
178 | int max_state; /* Max animation state object should be drawn in */ |
| 180 | int base_state; /* starting index # to draw from */ |
179 | int base_state; /* starting index # to draw from */ |
| 181 | |
180 | |
| 182 | if (!op->animation_id || !NUM_ANIMATIONS (op)) |
181 | if (!op->animation_id || !NUM_ANIMATIONS (op)) |
| 183 | { |
182 | { |
| 184 | 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); |
| 185 | return; |
185 | return; |
| 186 | } |
186 | } |
| 187 | |
187 | |
| 188 | if (op->head) |
188 | if (op->head) |
| 189 | { |
189 | { |
