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.33 by root, Fri Nov 6 13:03:34 2009 UTC vs.
Revision 1.37 by root, Sun Apr 11 00:34:05 2010 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 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.
67 animhash_t::iterator i = animhash.find (name); 67 animhash_t::iterator i = animhash.find (name);
68 return animations [i == animhash.end () ? 0 : i->second]; 68 return animations [i == animhash.end () ? 0 : i->second];
69} 69}
70 70
71void 71void
72init_anim (void) 72init_anim ()
73{ 73{
74 animation &anim0 = animation::create ("none", 1, 0); 74 animation &anim0 = animation::create ("none", 1, 0);
75 anim0.faces [0] = 0; 75 anim0.faces [0] = 0;
76} 76}
77 77
101 int base_state; /* starting index # to draw from */ 101 int base_state; /* starting index # to draw from */
102 102
103 if (!op->animation_id || !NUM_ANIMATIONS (op)) 103 if (!op->animation_id || !NUM_ANIMATIONS (op))
104 { 104 {
105 LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ()); 105 LOG (llevError, "Object %s lacks animation.\n", op->debug_desc ());
106 CLEAR_FLAG (op, FLAG_ANIMATE); 106 op->clr_flag (FLAG_ANIMATE);
107 return; 107 return;
108 } 108 }
109 109
110 if (op->head_ () != op) 110 if (op->head_ () != op)
111 { 111 {
158 else if (op->type != PLAYER && op->arch->flag [FLAG_ALIVE]) 158 else if (op->type != PLAYER && op->arch->flag [FLAG_ALIVE])
159 { 159 {
160 if (op->face == 0) 160 if (op->face == 0)
161 { 161 {
162 op->invisible = 1; 162 op->invisible = 1;
163 CLEAR_FLAG (op, FLAG_ALIVE); 163 op->clr_flag (FLAG_ALIVE);
164 } 164 }
165 else 165 else
166 { 166 {
167 op->invisible = 0; 167 op->invisible = 0;
168 SET_FLAG (op, FLAG_ALIVE); 168 op->set_flag (FLAG_ALIVE);
169 } 169 }
170 } 170 }
171 171
172 if (op->more) 172 if (op->more)
173 animate_object (op->more, dir); 173 animate_object (op->more, dir);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines