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.128 by root, Tue May 5 04:51:55 2009 UTC vs.
Revision 1.135 by root, Fri Oct 23 03:08:34 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{
927 case KW_anim_speed: f.get (anim_speed); break; 941 case KW_anim_speed: f.get (anim_speed); break;
928 case KW_container: f.get (weight_limit); break; 942 case KW_container: f.get (weight_limit); break;
929 case KW_will_apply: f.get (will_apply); break; 943 case KW_will_apply: f.get (will_apply); break;
930 case KW_attack_movement: f.get (attack_movement); break; 944 case KW_attack_movement: f.get (attack_movement); break;
931 case KW_move_state: f.get (move_status); break; 945 case KW_move_state: f.get (move_status); break;
932 case KW_expmul: f.get (expmul); break; 946 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
933 case KW_glow_radius: f.get (glow_radius); break; 947 case KW_glow_radius: f.get (glow_radius); break;
934 case KW_weapontype: f.get (weapontype); break; 948 case KW_weapontype: f.get (weapontype); break;
935 case KW_casting_time: f.get (casting_time); break; 949 case KW_casting_time: f.get (casting_time); break;
936 950
937 // elevation is deprecated 951 // elevation is deprecated
980 loading_arch 994 loading_arch
981 ? treasurelist::get (f.get_str ()) 995 ? treasurelist::get (f.get_str ())
982 : treasurelist::find (f.get_str ()); 996 : treasurelist::find (f.get_str ());
983 997
984 if (!randomitems) 998 if (!randomitems)
999 {
985 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1000 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1001 randomitems = treasurelist::get (shstr_none); // avoid crashes
1002 }
986 } 1003 }
987 else 1004 else
988 randomitems = 0; 1005 randomitems = 0;
989 break; 1006 break;
990 1007
1289 1306
1290 /* We don't need to worry about the arch's extra fields - they 1307 /* We don't need to worry about the arch's extra fields - they
1291 * will get taken care of the copy_to method. 1308 * will get taken care of the copy_to method.
1292 */ 1309 */
1293 1310
1311 if (op->uuid)
1294 f.put (KW_uuid, op->uuid.c_str ()); 1312 f.put (KW_uuid, op->uuid.c_str ());
1295 1313
1296#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1314#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) 1315#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1298 1316
1299 if (object *owner = op->owner) 1317 if (object *owner = op->owner)
1430 * the only place this is not set is when saving the player. 1448 * the only place this is not set is when saving the player.
1431 */ 1449 */
1432bool 1450bool
1433object::write (object_freezer &f) 1451object::write (object_freezer &f)
1434{ 1452{
1435 archetype *at = arch ? arch : archetype::empty; 1453 if (is_arch ())
1436 1454 {
1455 f.put (KW_object, arch->archname);
1456 write_diff (f, this, archetype::empty);
1457 }
1458 else
1459 {
1437 f.put (KW_arch, at->archname); 1460 f.put (KW_arch, arch->archname);
1438 write_diff (f, this, at); 1461 write_diff (f, this, arch);
1462 }
1439 1463
1440 for (object *tmp = inv; tmp; tmp = tmp->below) 1464 for (object *tmp = inv; tmp; tmp = tmp->below)
1441 tmp->write (f); 1465 tmp->write (f);
1442 1466
1443 f.put (this); 1467 f.put (this);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines