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.15 by pippijn, Sat Jan 6 14:42:28 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
… …
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++)
… …
66 { 65 {
67 Animations anim0; 66 Animations anim0;
68 67
69 anim0.name = "###none"; 68 anim0.name = "###none";
70 anim0.num_animations = 1; 69 anim0.num_animations = 1;
71 anim0.faces = (Fontindex *) malloc (sizeof (Fontindex)); 70 anim0.faces = (uint16 *)malloc (sizeof (uint16));
72 anim0.faces[0] = 0; 71 anim0.faces[0] = 0;
73 anim0.facings = 0; 72 anim0.facings = 0;
74 73
75 animations.push_back (anim0); 74 animations.push_back (anim0);
76 } 75 }
77 76
78 sprintf (buf, "%s/animations", settings.datadir); 77 sprintf (buf, "%s/animations", settings.datadir);
79 LOG (llevDebug, "Reading animations from %s...", buf); 78 LOG (llevDebug, "Reading animations from %s...\n", buf);
80 if ((fp = fopen (buf, "r")) == NULL) 79 if ((fp = fopen (buf, "r")) == NULL)
81 { 80 {
82 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));
83 exit (-1); 82 exit (-1);
84 } 83 }
… …
104 anim.facings = 1; 103 anim.facings = 1;
105 animations.push_back (anim); 104 animations.push_back (anim);
106 } 105 }
107 else if (!strncmp (buf, "mina", 4)) 106 else if (!strncmp (buf, "mina", 4))
108 { 107 {
109 animations[num_animations].faces = (Fontindex *) malloc (sizeof (Fontindex) * num_frames); 108 animations[num_animations].faces = (uint16 *) malloc (sizeof (uint16) * num_frames);
110 for (i = 0; i < num_frames; i++) 109 for (i = 0; i < num_frames; i++)
111 animations[num_animations].faces[i] = faces[i]; 110 animations[num_animations].faces[i] = faces[i];
112 animations[num_animations].num_animations = num_frames; 111 animations[num_animations].num_animations = num_frames;
113 if (num_frames % animations[num_animations].facings) 112 if (num_frames % animations[num_animations].facings)
114 { 113 {
… …
141{ 140{
142 return strcmp (a->name, b->name); 141 return strcmp (a->name, b->name);
143} 142}
144 143
145/* 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
146 * 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
147 */ 146 */
148int 147int
149find_animation (const char *name) 148find_animation (const char *name)
150{ 149{
151 Animations 150 Animations
… …
175 */ 174 */
176 175
177void 176void
178animate_object (object *op, int dir) 177animate_object (object *op, int dir)
179{ 178{
180 int
181 max_state; /* Max animation state object should be drawn in */ 179 int max_state; /* Max animation state object should be drawn in */
182 int
183 base_state; /* starting index # to draw from */ 180 int base_state; /* starting index # to draw from */
184 181
185 if (!op->animation_id || !NUM_ANIMATIONS (op)) 182 if (!op->animation_id || !NUM_ANIMATIONS (op))
186 { 183 {
187 LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ()); 184 LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ());
188 return; 185 return;

Diff Legend

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