ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.130 by root, Wed Sep 16 23:22:50 2009 UTC vs.
Revision 1.134 by root, Mon Oct 12 14:00:57 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your 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 GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * 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>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
461 } 462 }
462 else 463 else
463 move_type = MOVE_WALK; 464 move_type = MOVE_WALK;
464 } 465 }
465 } 466 }
467
468 // if the object has an animation, try to provide a default face
469 if (has_anim ())
470 {
471 const animation &anim_ob = anim ();
472
473 if (anim_speed)
474 // if this item is time-animated, force the last frame
475 animate_object (this, 0);
476 else if (flag [FLAG_MONSTER])
477 // if it is a monster, set appropriate facing
478 animate_object (this, direction);
479 }
466} 480}
467 481
468static void 482static void
469set_move (MoveType &mt, const char *str) 483set_move (MoveType &mt, const char *str)
470{ 484{
… …
1289 1303
1290 /* We don't need to worry about the arch's extra fields - they 1304 /* We don't need to worry about the arch's extra fields - they
1291 * will get taken care of the copy_to method. 1305 * will get taken care of the copy_to method.
1292 */ 1306 */
1293 1307
1308 if (op->uuid)
1294 f.put (KW_uuid, op->uuid.c_str ()); 1309 f.put (KW_uuid, op->uuid.c_str ());
1295 1310
1296#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1311#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1297#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1312#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1298 1313
1299 if (object *owner = op->owner) 1314 if (object *owner = op->owner)

Diff Legend

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