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.36 by root, Fri Mar 26 01:04:43 2010 UTC vs.
Revision 1.41 by root, Wed Nov 14 06:21:39 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/* This file contains animation related code. */ 25/* This file contains animation related code. */
26 26
… …
56 animhash.insert (std::make_pair (anim.name, anim.number)); 56 animhash.insert (std::make_pair (anim.name, anim.number));
57 57
58 return anim; 58 return anim;
59} 59}
60 60
61/* Tries to find the animation id that matches name. Returns an integer match
62 * 0 if no match found (animation 0 is initialised as the 'bug' face
63 */
61animation & 64animation &
62animation::find (const char *name) 65animation::find (const char *name)
63{ 66{
64 if (!name) 67 if (!name)
65 return animations [0]; 68 return animations [0];
… …
71void 74void
72init_anim () 75init_anim ()
73{ 76{
74 animation &anim0 = animation::create ("none", 1, 0); 77 animation &anim0 = animation::create ("none", 1, 0);
75 anim0.faces [0] = 0; 78 anim0.faces [0] = 0;
76}
77
78/* Tries to find the animation id that matches name. Returns an integer match
79 * 0 if no match found (animation 0 is initialised as the 'bug' face
80 */
81//TODO: nuke this function and replace all occurences by animations::find
82int
83find_animation (const char *name)
84{
85 return animation::find (name).number;
86} 79}
87 80
88/* 81/*
89 * animate_object(object) updates the face-variable of an object. 82 * animate_object(object) updates the face-variable of an object.
90 * If the object is the head of a multi-object, all objects are animated. 83 * If the object is the head of a multi-object, all objects are animated.
… …
101 int base_state; /* starting index # to draw from */ 94 int base_state; /* starting index # to draw from */
102 95
103 if (!op->animation_id || !NUM_ANIMATIONS (op)) 96 if (!op->animation_id || !NUM_ANIMATIONS (op))
104 { 97 {
105 LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ()); 98 LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ());
106 CLEAR_FLAG (op, FLAG_ANIMATE); 99 op->clr_flag (FLAG_ANIMATE);
107 return; 100 return;
108 } 101 }
109 102
110 if (op->head_ () != op) 103 if (op->head_ () != op)
111 { 104 {
… …
158 else if (op->type != PLAYER && op->arch->flag [FLAG_ALIVE]) 151 else if (op->type != PLAYER && op->arch->flag [FLAG_ALIVE])
159 { 152 {
160 if (op->face == 0) 153 if (op->face == 0)
161 { 154 {
162 op->invisible = 1; 155 op->invisible = 1;
163 CLEAR_FLAG (op, FLAG_ALIVE); 156 op->clr_flag (FLAG_ALIVE);
164 } 157 }
165 else 158 else
166 { 159 {
167 op->invisible = 0; 160 op->invisible = 0;
168 SET_FLAG (op, FLAG_ALIVE); 161 op->set_flag (FLAG_ALIVE);
169 } 162 }
170 } 163 }
171 164
172 if (op->more) 165 if (op->more)
173 animate_object (op->more, dir); 166 animate_object (op->more, dir);

Diff Legend

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