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.126 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.133 by root, Wed Sep 23 04:07:52 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
963 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 976 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
964 case KW_can_apply: 977 case KW_can_apply:
965 break; 978 break;
966 979
967 case KW_connected: 980 case KW_connected:
968 add_button_link (this, map, f.get_sint32 ()); 981 {
982 shstr connected;
983
984 f.get (connected);
985 add_link (map, connected);
986 }
969 break; 987 break;
970 988
971 case KW_randomitems: 989 case KW_randomitems:
972 if (f.get_str ()) 990 if (f.get_str ())
973 { 991 {
1284 1302
1285 /* We don't need to worry about the arch's extra fields - they 1303 /* We don't need to worry about the arch's extra fields - they
1286 * will get taken care of the copy_to method. 1304 * will get taken care of the copy_to method.
1287 */ 1305 */
1288 1306
1307 if (op->uuid)
1289 f.put (KW_uuid, op->uuid.c_str ()); 1308 f.put (KW_uuid, op->uuid.c_str ());
1290 1309
1291#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1310#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1292#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1311#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1293 1312
1294 if (object *owner = op->owner) 1313 if (object *owner = op->owner)
1310 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1329 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1311 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1330 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1312 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1331 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1313 1332
1314 if (op->animation_id != tmp->animation_id) 1333 if (op->animation_id != tmp->animation_id)
1315 if (op->animation_id) 1334 if (op->has_anim ())
1316 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1335 f.put (KW_animation, op->anim ().name);
1317 else 1336 else
1318 { 1337 {
1319 f.put (KW_animation, (const char *)0); 1338 f.put (KW_animation, (const char *)0);
1320 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1339 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1321 } 1340 }
1378 CMP_OUT (last_grace); 1397 CMP_OUT (last_grace);
1379 CMP_OUT (last_eat); 1398 CMP_OUT (last_eat);
1380 CMP_OUT (glow_radius); 1399 CMP_OUT (glow_radius);
1381 1400
1382 if (op->flag [FLAG_IS_LINKED]) 1401 if (op->flag [FLAG_IS_LINKED])
1383 if (int i = get_button_value (op)) 1402 if (auto (ol, op->find_link ()))
1384 f.put (KW_connected, i); 1403 f.put (KW_connected, ol->id);
1385 1404
1386 CMP_OUT (randomitems); 1405 CMP_OUT (randomitems);
1387 CMP_OUT2 (container, weight_limit); 1406 CMP_OUT2 (container, weight_limit);
1388 1407
1389 CMP_OUT (run_away); 1408 CMP_OUT (run_away);
1425 * the only place this is not set is when saving the player. 1444 * the only place this is not set is when saving the player.
1426 */ 1445 */
1427bool 1446bool
1428object::write (object_freezer &f) 1447object::write (object_freezer &f)
1429{ 1448{
1430 archetype *at = arch ? arch : archetype::empty; 1449 if (is_arch ())
1431 1450 {
1451 f.put (KW_object, arch->archname);
1452 write_diff (f, this, archetype::empty);
1453 }
1454 else
1455 {
1432 f.put (KW_arch, at->archname); 1456 f.put (KW_arch, arch->archname);
1433 write_diff (f, this, at); 1457 write_diff (f, this, arch);
1458 }
1434 1459
1435 for (object *tmp = inv; tmp; tmp = tmp->below) 1460 for (object *tmp = inv; tmp; tmp = tmp->below)
1436 tmp->write (f); 1461 tmp->write (f);
1437 1462
1438 f.put (this); 1463 f.put (this);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines