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.124 by root, Tue Sep 30 07:51:17 2008 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
339 */ 339 */
340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
341 { 341 {
342 if (!skill) 342 if (!skill)
343 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ()); 343 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
344 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 344 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 345 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
346 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 346 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
347 } 347 }
348 348
349 /* We changed last_heal to gen_sp_armour, which is what it 349 /* We changed last_heal to gen_sp_armour, which is what it
350 * really does for many objects. Need to catch any in maps 350 * really does for many objects. Need to catch any in maps
460 stats.maxhp = 0; 460 stats.maxhp = 0;
461 } 461 }
462 else 462 else
463 move_type = MOVE_WALK; 463 move_type = MOVE_WALK;
464 } 464 }
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);
465 } 478 }
466} 479}
467 480
468static void 481static void
469set_move (MoveType &mt, const char *str) 482set_move (MoveType &mt, const char *str)
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_tooltype: f.get (tooltype); break;
936 case KW_casting_time: f.get (casting_time); break; 948 case KW_casting_time: f.get (casting_time); break;
937 949
938 // elevation is deprecated 950 // elevation is deprecated
939 case KW_elevation: break; 951 case KW_elevation: break;
940 952
964 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;
965 case KW_can_apply: 977 case KW_can_apply:
966 break; 978 break;
967 979
968 case KW_connected: 980 case KW_connected:
969 add_button_link (this, map, f.get_sint32 ()); 981 {
982 shstr connected;
983
984 f.get (connected);
985 add_link (map, connected);
986 }
970 break; 987 break;
971 988
972 case KW_randomitems: 989 case KW_randomitems:
973 if (f.get_str ()) 990 if (f.get_str ())
974 { 991 {
1311 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);
1312 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);
1313 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);
1314 1331
1315 if (op->animation_id != tmp->animation_id) 1332 if (op->animation_id != tmp->animation_id)
1316 if (op->animation_id) 1333 if (op->has_anim ())
1317 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1334 f.put (KW_animation, op->anim ().name);
1318 else 1335 else
1319 { 1336 {
1320 f.put (KW_animation, (const char *)0); 1337 f.put (KW_animation, (const char *)0);
1321 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1338 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1322 } 1339 }
1379 CMP_OUT (last_grace); 1396 CMP_OUT (last_grace);
1380 CMP_OUT (last_eat); 1397 CMP_OUT (last_eat);
1381 CMP_OUT (glow_radius); 1398 CMP_OUT (glow_radius);
1382 1399
1383 if (op->flag [FLAG_IS_LINKED]) 1400 if (op->flag [FLAG_IS_LINKED])
1384 if (int i = get_button_value (op)) 1401 if (auto (ol, op->find_link ()))
1385 f.put (KW_connected, i); 1402 f.put (KW_connected, ol->id);
1386 1403
1387 CMP_OUT (randomitems); 1404 CMP_OUT (randomitems);
1388 CMP_OUT2 (container, weight_limit); 1405 CMP_OUT2 (container, weight_limit);
1389 1406
1390 CMP_OUT (run_away); 1407 CMP_OUT (run_away);
1391 CMP_OUT (pick_up); 1408 CMP_OUT (pick_up);
1392 CMP_OUT (will_apply); 1409 CMP_OUT (will_apply);
1393 CMP_OUT (smoothlevel); 1410 CMP_OUT (smoothlevel);
1394 CMP_OUT (weapontype); 1411 CMP_OUT (weapontype);
1395 CMP_OUT (tooltype);
1396 CMP_OUT (client_type); 1412 CMP_OUT (client_type);
1397 CMP_OUT (item_power); 1413 CMP_OUT (item_power);
1398 CMP_OUT (duration); 1414 CMP_OUT (duration);
1399 CMP_OUT (range); 1415 CMP_OUT (range);
1400 CMP_OUT (range_modifier); 1416 CMP_OUT (range_modifier);
1427 * 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.
1428 */ 1444 */
1429bool 1445bool
1430object::write (object_freezer &f) 1446object::write (object_freezer &f)
1431{ 1447{
1432 archetype *at = arch ? arch : archetype::empty; 1448 if (is_arch ())
1433 1449 {
1450 f.put (KW_object, arch->archname);
1451 write_diff (f, this, archetype::empty);
1452 }
1453 else
1454 {
1434 f.put (KW_arch, at->archname); 1455 f.put (KW_arch, arch->archname);
1435 write_diff (f, this, at); 1456 write_diff (f, this, arch);
1457 }
1436 1458
1437 for (object *tmp = inv; tmp; tmp = tmp->below) 1459 for (object *tmp = inv; tmp; tmp = tmp->below)
1438 tmp->write (f); 1460 tmp->write (f);
1439 1461
1440 f.put (this); 1462 f.put (this);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines