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

Diff Legend

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