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.2 by root, Tue Aug 29 08:01:35 2006 UTC vs.
Revision 1.6 by root, Sun Sep 3 08:05:39 2006 UTC

1/* 1/*
2 * static char *rcsid_anim_c = 2 * static char *rcsid_anim_c =
3 * "$Id: anim.C,v 1.2 2006/08/29 08:01:35 root Exp $"; 3 * "$Id: anim.C,v 1.6 2006/09/03 08:05:39 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
… …
29/* This file contains animation related code. */ 29/* This file contains animation related code. */
30 30
31#include <global.h> 31#include <global.h>
32#include <stdio.h> 32#include <stdio.h>
33 33
34std::vector<Animations> animations;
35
34void free_all_anim(void) { 36void free_all_anim(void)
35 int i; 37{
36
37 for (i=0; i<=num_animations; i++) { 38 for (int i=0; i<=num_animations; i++)
38 free_string(animations[i].name); 39 {
40 animations[i].name = 0;
39 free(animations[i].faces); 41 free (animations[i].faces);
40 } 42 }
41 free(animations); 43
44 animations.clear ();
42} 45}
43 46
44void init_anim(void) { 47void init_anim(void) {
45 char buf[MAX_BUF]; 48 char buf[MAX_BUF];
46 FILE *fp; 49 FILE *fp;
47 static int anim_init=0; 50 static int anim_init=0;
48 int num_frames=0,faces[MAX_ANIMATIONS],i; 51 int num_frames=0,faces[MAX_ANIMATIONS],i;
49 52
50 if (anim_init) return; 53 if (anim_init) return;
51 animations_allocated=9;
52 num_animations=0; 54 num_animations=0;
53 /* Make a default. New animations start at one, so if something 55 /* Make a default. New animations start at one, so if something
54 * thinks it is animated but hasn't set the animation_id properly, 56 * thinks it is animated but hasn't set the animation_id properly,
55 * it will have a default value that should be pretty obvious. 57 * it will have a default value that should be pretty obvious.
56 */ 58 */
57 animations = (Animations *) malloc(10*sizeof(Animations));
58 /* set the name so we don't try to dereferance null. 59 /* set the name so we don't try to dereferance null.
59 * Put # at start so it will be first in alphabetical 60 * Put # at start so it will be first in alphabetical
60 * order. 61 * order.
61 */ 62 */
62 animations[0].name=add_string("###none"); 63 {
64 Animations anim0;
65
66 anim0.name = "###none";
63 animations[0].num_animations=1; 67 anim0.num_animations=1;
64 animations[0].faces = (Fontindex *) malloc(sizeof(Fontindex)); 68 anim0.faces = (Fontindex *) malloc(sizeof(Fontindex));
65 animations[0].faces[0]=0; 69 anim0.faces[0]=0;
66 animations[0].facings=0; 70 anim0.facings=0;
71
72 animations.push_back (anim0);
73 }
67 74
68 sprintf(buf,"%s/animations", settings.datadir); 75 sprintf(buf,"%s/animations", settings.datadir);
69 LOG(llevDebug,"Reading animations from %s...", buf); 76 LOG(llevDebug,"Reading animations from %s...", buf);
70 if ((fp=fopen(buf,"r")) ==NULL) { 77 if ((fp=fopen(buf,"r")) ==NULL) {
71 LOG(llevError, "Cannot open animations file %s: %s\n", buf, strerror_local(errno)); 78 LOG(llevError, "Cannot open animations file %s: %s\n", buf, strerror(errno));
72 exit(-1); 79 exit(-1);
73 } 80 }
74 while (fgets(buf, MAX_BUF-1, fp)!=NULL) { 81 while (fgets(buf, MAX_BUF-1, fp)!=NULL) {
75 if (*buf=='#') continue; 82 if (*buf=='#') continue;
76 /* Kill the newline */ 83 /* Kill the newline */
… …
79 if (num_frames) { 86 if (num_frames) {
80 LOG(llevError,"Didn't get a mina before %s\n", buf); 87 LOG(llevError,"Didn't get a mina before %s\n", buf);
81 num_frames=0; 88 num_frames=0;
82 } 89 }
83 num_animations++; 90 num_animations++;
84 if (num_animations==animations_allocated) { 91
85 animations= (Animations *) realloc(animations, sizeof(Animations)*(animations_allocated+10)); 92 Animations anim;
86 animations_allocated+=10; 93 anim.name = buf + 5;
87 }
88 animations[num_animations].name = add_string(buf+5);
89 animations[num_animations].num = num_animations; /* for bsearch */ 94 anim.num = num_animations; /* for bsearch */
90 animations[num_animations].facings = 1; 95 anim.facings = 1;
96 animations.push_back (anim);
91 } 97 }
92 else if (!strncmp(buf,"mina",4)) { 98 else if (!strncmp(buf,"mina",4)) {
93 animations[num_animations].faces = (Fontindex *) malloc(sizeof(Fontindex)*num_frames); 99 animations[num_animations].faces = (Fontindex *) malloc(sizeof(Fontindex)*num_frames);
94 for (i=0; i<num_frames; i++) 100 for (i=0; i<num_frames; i++)
95 animations[num_animations].faces[i]=faces[i]; 101 animations[num_animations].faces[i]=faces[i];
96 animations[num_animations].num_animations = num_frames; 102 animations[num_animations].num_animations = num_frames;
97 if (num_frames % animations[num_animations].facings) { 103 if (num_frames % animations[num_animations].facings) {
98 LOG(llevDebug,"Animation %s frame numbers (%d) is not a multiple of facings (%d)\n", 104 LOG(llevDebug,"Animation %s frame numbers (%d) is not a multiple of facings (%d)\n",
99 animations[num_animations].name, num_frames, animations[num_animations].facings); 105 &animations[num_animations].name, num_frames, animations[num_animations].facings);
100 } 106 }
101 num_frames=0; 107 num_frames=0;
102 } 108 }
103 else if (!strncmp(buf,"facings",7)) { 109 else if (!strncmp(buf,"facings",7)) {
104 if (!(animations[num_animations].facings = atoi(buf+7))) { 110 if (!(animations[num_animations].facings = atoi(buf+7))) {
105 LOG(llevDebug,"Animation %s has 0 facings, line=%s\n", 111 LOG(llevDebug,"Animation %s has 0 facings, line=%s\n",
106 animations[num_animations].name, buf); 112 &animations[num_animations].name, buf);
107 animations[num_animations].facings=1; 113 animations[num_animations].facings=1;
108 } 114 }
109 115
110 } else { 116 } else {
111 if (!(faces[num_frames++] = FindFace(buf,0))) 117 if (!(faces[num_frames++] = FindFace(buf,0)))
112 LOG(llevDebug,"Could not find face %s for animation %s\n", 118 LOG(llevDebug,"Could not find face %s for animation %s\n",
113 buf, animations[num_animations].name); 119 buf, &animations[num_animations].name);
114 } 120 }
115 } 121 }
116 fclose(fp); 122 fclose(fp);
117 LOG(llevDebug,"done. got (%d)\n", num_animations); 123 LOG(llevDebug,"done. got (%d)\n", num_animations);
118} 124}
… …
128{ 134{
129 Animations search, *match; 135 Animations search, *match;
130 136
131 search.name = name; 137 search.name = name;
132 138
133 match = (Animations*)bsearch(&search, animations, (num_animations+1), 139 match = (Animations*)bsearch(&search, &animations [0], (num_animations+1),
134 sizeof(Animations), (int (*)(const void*, const void*))anim_compare); 140 sizeof(Animations), (int (*)(const void*, const void*))anim_compare);
135 141
136 142
137 if (match) return match->num; 143 if (match) return match->num;
138 LOG(llevError,"Unable to find animation %s\n", name); 144 LOG(llevError,"Unable to find animation %s\n", name);

Diff Legend

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