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.14 by pippijn, Wed Jan 3 00:21:34 2007 UTC

… …
23 23
24/* This file contains animation related code. */ 24/* This file contains animation related code. */
25 25
26#include <global.h> 26#include <global.h>
27#include <stdio.h> 27#include <stdio.h>
28
29std::vector<Animations> animations;
30 28
31void 29void
32free_all_anim (void) 30free_all_anim (void)
33{ 31{
34 for (int i = 0; i <= num_animations; i++) 32 for (int i = 0; i <= num_animations; i++)
… …
66 { 64 {
67 Animations anim0; 65 Animations anim0;
68 66
69 anim0.name = "###none"; 67 anim0.name = "###none";
70 anim0.num_animations = 1; 68 anim0.num_animations = 1;
71 anim0.faces = (Fontindex *) malloc (sizeof (Fontindex)); 69 anim0.faces = (uint16 *)malloc (sizeof (uint16));
72 anim0.faces[0] = 0; 70 anim0.faces[0] = 0;
73 anim0.facings = 0; 71 anim0.facings = 0;
74 72
75 animations.push_back (anim0); 73 animations.push_back (anim0);
76 } 74 }
77 75
78 sprintf (buf, "%s/animations", settings.datadir); 76 sprintf (buf, "%s/animations", settings.datadir);
79 LOG (llevDebug, "Reading animations from %s...", buf); 77 LOG (llevDebug, "Reading animations from %s...\n", buf);
80 if ((fp = fopen (buf, "r")) == NULL) 78 if ((fp = fopen (buf, "r")) == NULL)
81 { 79 {
82 LOG (llevError, "Cannot open animations file %s: %s\n", buf, strerror (errno)); 80 LOG (llevError, "Cannot open animations file %s: %s\n", buf, strerror (errno));
83 exit (-1); 81 exit (-1);
84 } 82 }
… …
104 anim.facings = 1; 102 anim.facings = 1;
105 animations.push_back (anim); 103 animations.push_back (anim);
106 } 104 }
107 else if (!strncmp (buf, "mina", 4)) 105 else if (!strncmp (buf, "mina", 4))
108 { 106 {
109 animations[num_animations].faces = (Fontindex *) malloc (sizeof (Fontindex) * num_frames); 107 animations[num_animations].faces = (uint16 *) malloc (sizeof (uint16) * num_frames);
110 for (i = 0; i < num_frames; i++) 108 for (i = 0; i < num_frames; i++)
111 animations[num_animations].faces[i] = faces[i]; 109 animations[num_animations].faces[i] = faces[i];
112 animations[num_animations].num_animations = num_frames; 110 animations[num_animations].num_animations = num_frames;
113 if (num_frames % animations[num_animations].facings) 111 if (num_frames % animations[num_animations].facings)
114 { 112 {
… …
141{ 139{
142 return strcmp (a->name, b->name); 140 return strcmp (a->name, b->name);
143} 141}
144 142
145/* Tries to find the animation id that matches name. Returns an integer match 143/* 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 144 * 0 if no match found (animation 0 is initialised as the 'bug' face
147 */ 145 */
148int 146int
149find_animation (const char *name) 147find_animation (const char *name)
150{ 148{
151 Animations 149 Animations
… …
175 */ 173 */
176 174
177void 175void
178animate_object (object *op, int dir) 176animate_object (object *op, int dir)
179{ 177{
180 int
181 max_state; /* Max animation state object should be drawn in */ 178 int max_state; /* Max animation state object should be drawn in */
182 int
183 base_state; /* starting index # to draw from */ 179 int base_state; /* starting index # to draw from */
184 180
185 if (!op->animation_id || !NUM_ANIMATIONS (op)) 181 if (!op->animation_id || !NUM_ANIMATIONS (op))
186 { 182 {
187 LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ()); 183 LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ());
188 return; 184 return;

Diff Legend

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