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.127 by root, Thu Jan 8 03:03:23 2009 UTC vs.
Revision 1.132 by root, Thu Sep 17 01:57:31 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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
461 } 461 }
462 else 462 else
463 move_type = MOVE_WALK; 463 move_type = MOVE_WALK;
464 } 464 }
465 } 465 }
466
467 // if the object has an animation, try to provide a default face
468 if (has_anim ())
469 {
470 const animation &anim_ob = anim ();
471
472 if (anim_speed)
473 // if this item is time-animated, force the last frame
474 animate_object (this, 0);
475 else if (flag [FLAG_MONSTER])
476 // if it is a monster, set appropriate facing
477 animate_object (this, direction);
478 }
466} 479}
467 480
468static void 481static void
469set_move (MoveType &mt, const char *str) 482set_move (MoveType &mt, const char *str)
470{ 483{
927 case KW_anim_speed: f.get (anim_speed); break; 940 case KW_anim_speed: f.get (anim_speed); break;
928 case KW_container: f.get (weight_limit); break; 941 case KW_container: f.get (weight_limit); break;
929 case KW_will_apply: f.get (will_apply); break; 942 case KW_will_apply: f.get (will_apply); break;
930 case KW_attack_movement: f.get (attack_movement); break; 943 case KW_attack_movement: f.get (attack_movement); break;
931 case KW_move_state: f.get (move_status); break; 944 case KW_move_state: f.get (move_status); break;
932 case KW_expmul: f.get (expmul); break; 945 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
933 case KW_glow_radius: f.get (glow_radius); break; 946 case KW_glow_radius: f.get (glow_radius); break;
934 case KW_weapontype: f.get (weapontype); break; 947 case KW_weapontype: f.get (weapontype); break;
935 case KW_casting_time: f.get (casting_time); break; 948 case KW_casting_time: f.get (casting_time); break;
936 949
937 // elevation is deprecated 950 // elevation is deprecated
1315 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1328 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1316 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1329 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1317 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1330 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1318 1331
1319 if (op->animation_id != tmp->animation_id) 1332 if (op->animation_id != tmp->animation_id)
1320 if (op->animation_id) 1333 if (op->has_anim ())
1321 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1334 f.put (KW_animation, op->anim ().name);
1322 else 1335 else
1323 { 1336 {
1324 f.put (KW_animation, (const char *)0); 1337 f.put (KW_animation, (const char *)0);
1325 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1338 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1326 } 1339 }
1430 * the only place this is not set is when saving the player. 1443 * the only place this is not set is when saving the player.
1431 */ 1444 */
1432bool 1445bool
1433object::write (object_freezer &f) 1446object::write (object_freezer &f)
1434{ 1447{
1435 archetype *at = arch ? arch : archetype::empty; 1448 if (is_arch ())
1436 1449 {
1450 f.put (KW_object, arch->archname);
1451 write_diff (f, this, archetype::empty);
1452 }
1453 else
1454 {
1437 f.put (KW_arch, at->archname); 1455 f.put (KW_arch, arch->archname);
1438 write_diff (f, this, at); 1456 write_diff (f, this, arch);
1457 }
1439 1458
1440 for (object *tmp = inv; tmp; tmp = tmp->below) 1459 for (object *tmp = inv; tmp; tmp = tmp->below)
1441 tmp->write (f); 1460 tmp->write (f);
1442 1461
1443 f.put (this); 1462 f.put (this);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines