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.104 by elmex, Thu Nov 8 12:10:47 2007 UTC vs.
Revision 1.135 by root, Fri Oct 23 03:08:34 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27 24
28#include <global.h> 25#include <global.h>
29#include <loader.h> 26#include <loader.h>
30#include <sproto.h> 27#include <sproto.h>
31 28
… …
261void 258void
262object::post_load_check () 259object::post_load_check ()
263{ 260{
264 if (type >= NUM_TYPES) 261 if (type >= NUM_TYPES)
265 { 262 {
266 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); 263 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
267 type = 0; 264 type = 0;
268 } 265 }
269 266
270 switch (type) 267 switch (type)
271 { 268 {
… …
273 case WAND: 270 case WAND:
274 case ROD: 271 case ROD:
275 case HORN: 272 case HORN:
276 if (slot [body_range].info != -1) 273 if (slot [body_range].info != -1)
277 { 274 {
278 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 275 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
279 slot [body_range].info = -1; 276 slot [body_range].info = -1;
280 } 277 }
281 break; 278 break;
282 279
283 case WEAPON: 280 case WEAPON:
284 if (slot [body_combat].info != -1) 281 if (slot [body_combat].info != -1)
285 { 282 {
286 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); 283 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
287 slot [body_combat].info = -1; 284 slot [body_combat].info = -1;
288 } 285 }
289 break; 286 break;
290 287
291 case SHIELD: 288 case SHIELD:
292 if (slot [body_shield].info != -1) 289 if (slot [body_shield].info != -1)
293 { 290 {
294 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 291 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
295 slot [body_shield].info = -1; 292 slot [body_shield].info = -1;
296 } 293 }
297 break; 294 break;
298 295
299 case PLAYER: 296 case PLAYER:
300 if (slot [body_shield].info != 1) 297 if (slot [body_shield].info != 1)
301 { 298 {
302 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 299 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
303 slot [body_shield].info = 1; 300 slot [body_shield].info = 1;
304 } 301 }
305 302
306 if (slot [body_combat].info != 1) 303 if (slot [body_combat].info != 1)
307 { 304 {
308 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 305 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
309 slot [body_combat].info = 1; 306 slot [body_combat].info = 1;
310 } 307 }
311 308
312 if (slot [body_range].info != 1) 309 if (slot [body_range].info != 1)
313 { 310 {
314 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 311 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
315 slot [body_range].info = 1; 312 slot [body_range].info = 1;
316 } 313 }
317 break; 314 break;
318 } 315 }
319 316
… …
342 * not in the ideal fashion. 339 * not in the ideal fashion.
343 */ 340 */
344 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 341 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
345 { 342 {
346 if (!skill) 343 if (!skill)
347 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 344 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
348 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 345 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
349 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 346 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
350 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 347 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
351 } 348 }
352 349
353 /* We changed last_heal to gen_sp_armour, which is what it 350 /* We changed last_heal to gen_sp_armour, which is what it
354 * really does for many objects. Need to catch any in maps 351 * really does for many objects. Need to catch any in maps
355 * that may have an old value. 352 * that may have an old value.
… …
361 || type == AMULET || type == GIRDLE 358 || type == AMULET || type == GIRDLE
362 || type == BRACERS || type == CLOAK) 359 || type == BRACERS || type == CLOAK)
363 { 360 {
364 if (last_heal) 361 if (last_heal)
365 { 362 {
366 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 363 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
367 gen_sp_armour = last_heal; 364 gen_sp_armour = last_heal;
368 last_heal = 0; 365 last_heal = 0;
369 } 366 }
370 367
371 int ip = calc_item_power (this, 0); 368 int ip = calc_item_power (this, 0);
372 369
373 /* Legacy objects from before item power was in the game */ 370 /* Legacy objects from before item power was in the game */
374 if (!item_power && ip) 371 if (!item_power && ip)
375 { 372 {
376 if (ip > 3) 373 if (ip > 3)
377 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); 374 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
378 375
379 item_power = ip; 376 item_power = ip;
380 } 377 }
381 378
382 /* Check for possibly bogus values. Has to meet both these criteria - 379 /* Check for possibly bogus values. Has to meet both these criteria -
… …
389 if (ip > 2 * item_power && ip > (item_power + 3)) 386 if (ip > 2 * item_power && ip > (item_power + 3))
390 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 387 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
391#endif 388#endif
392 } 389 }
393 390
394 /* Old spellcasting object - need to load in the appropiate object */ 391 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 392 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
393 if ((type == ROD
394 || type == WAND
395 || type == SCROLL
396 || type == HORN
397 || type == FIREWALL
396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 398 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 399 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
400 && !inv
401 && !loading_arch
402 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
403 // TODO: at least one watchout-comments is redundant - investigate/remove
398 { 404 {
405 // TODO: fix firewall object on map
399 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 406 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
400 * in that spell was stored in sp. 407 * in that spell was stored in sp.
401 */ 408 */
409 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
402 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 410 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
403 insert_ob_in_ob (tmp, this); 411 insert_ob_in_ob (tmp, this);
404 randomitems = NULL; /* So another spell isn't created for this object */ 412 randomitems = 0;
405 } 413 }
406 414
407 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 415 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
408 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 416 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
409 { 417 {
418 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
410 object *tmp = get_archetype_by_object_name (slaying); 419 object *tmp = get_archetype_by_object_name (slaying);
411 insert_ob_in_ob (tmp, this); 420 insert_ob_in_ob (tmp, this);
412 randomitems = NULL; /* So another spell isn't created for this object */ 421 randomitems = 0; /* So another spell isn't created for this object */
413 /* without this, value is all screwed up */ 422 /* without this, value is all screwed up */
414 value = arch->value * inv->value; 423 value = arch->value * inv->value;
415 } 424 }
416 425
417 if (QUERY_FLAG (this, FLAG_MONSTER)) 426 if (QUERY_FLAG (this, FLAG_MONSTER))
418 { 427 {
419 if (stats.hp > stats.maxhp) 428 if (stats.hp > stats.maxhp)
420 { 429 {
421 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 430 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
422 stats.maxhp = stats.hp; 431 stats.maxhp = stats.hp;
423 } 432 }
424 433
425 /* The archs just need to be updated for this */ 434 /* The archs just need to be updated for this */
426 if (move_type == 0) 435 if (move_type == 0)
427 move_type = MOVE_WALK; 436 move_type = MOVE_WALK;
428 } 437 }
429 438
430 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 439 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
431 {
432 /* Object will duplicate it's content as part of the 440 /* Object will duplicate it's content as part of the
433 * generation process. To do this, we must flag inventory 441 * generation process. To do this, we must flag inventory
434 * so it remains unevaluated concerning the randomitems and 442 * so it remains unevaluated concerning the randomitems and
435 * the living (a demonlord shouldn't cast from inside generator!) 443 * the living (a demonlord shouldn't cast from inside generator!)
436 */ 444 */
445 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
437 flag_inv (this, FLAG_IS_A_TEMPLATE); 446 flag_inv (this, FLAG_IS_A_TEMPLATE);
438 }
439 447
440 /* Handle player movers. We use move_type for player movers 448 /* Handle player movers. We use move_type for player movers
441 * because they operate on their own time (move_on 449 * because they operate on their own time (move_on
442 * would potentially cause them to be triggered when someone steps 450 * would potentially cause them to be triggered when someone steps
443 * on them). If move_type is set, presume person knows what they 451 * on them). If move_type is set, presume person knows what they
444 * are doing, otherwise, set move_type based on maxhp value. 452 * are doing, otherwise, set move_type based on maxhp value.
445 */ 453 */
446 if (type == PLAYERMOVER) 454 if (type == PLAYERMOVER)
447 { 455 {
448 if (!move_type) 456 if (!move_type)
… …
453 stats.maxhp = 0; 461 stats.maxhp = 0;
454 } 462 }
455 else 463 else
456 move_type = MOVE_WALK; 464 move_type = MOVE_WALK;
457 } 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);
458 } 479 }
459} 480}
460 481
461static void 482static void
462set_move (MoveType &mt, const char *str) 483set_move (MoveType &mt, const char *str)
… …
510 531
511 goto next; 532 goto next;
512 } 533 }
513 } 534 }
514 535
515 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 536 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
516 537
517next: ; 538next: ;
518 } 539 }
519} 540}
520 541
… …
522 543
523bool 544bool
524object::parse_kv (object_thawer &f) 545object::parse_kv (object_thawer &f)
525{ 546{
526 object *op_inv = inv; 547 object *op_inv = inv;
548 key_value *last_kv = key_values;
527 549
528 for (;;) 550 for (;;)
529 { 551 {
530 switch (f.kw) 552 switch (f.kw)
531 { 553 {
532 case KW_uuid: 554 case KW_uuid:
533 if (const char *s = f.get_str ()) 555 if (const char *s = f.get_str ())
534 { 556 if (!uuid.parse (s))
535 unsigned int version;
536 unsigned long long seq;
537
538 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
539 { 557 {
540 uuid.seq = seq; 558 f.parse_warn ("unparseable uuid");
541 break; 559 uuid = UUID::gen ();
542 } 560 }
543 }
544
545 uuid = gen_uuid ();
546 break; 561 break;
547 562
548 case KW_oid: 563 case KW_oid:
549 f.get (this, f.get_sint32 ()); 564 f.get (this, f.get_sint32 ());
550 break; 565 break;
… …
559 case KW_race: f.get_ornull (race); break; 574 case KW_race: f.get_ornull (race); break;
560 case KW_slaying: f.get_ornull (slaying); break; 575 case KW_slaying: f.get_ornull (slaying); break;
561 case KW_tag: f.get_ornull (tag); break; 576 case KW_tag: f.get_ornull (tag); break;
562 577
563 case KW_arch: 578 case KW_arch:
564 {
565 object *tmp = object::read (f); 579 if (object *tmp = object::read (f))
566 tmp->deactivate ();
567
568 { 580 {
581 tmp->deactivate ();
582
569 // was: insert_ob_in_ob (tmp, op); 583 // was: insert_ob_in_ob (tmp, op);
570 // but manually adding it can improve map loading times a lot 584 // but manually adding it can improve map loading times a lot
571 // also, appending instead of prepending keeps the 585 // also, appending instead of prepending keeps the
572 // save ordering the same between repeated load/saves. 586 // save ordering the same between repeated load/saves.
573 // and finally we do not want any funny effects 587 // and finally we do not want any funny effects
… …
590 604
591 tmp->below = 0; 605 tmp->below = 0;
592 tmp->env = this; 606 tmp->env = this;
593 op_inv = tmp; 607 op_inv = tmp;
594 } 608 }
595 } 609 else
610 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
611
596 continue; 612 continue;
597 613
598 case KW_other_arch: 614 case KW_other_arch:
599 other_arch =
600 loading_arch 615 if (loading_arch == this)
601 ? archetype::get (f.get_str ()) 616 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
617 else
618 {
602 : archetype::find (f.get_str ()); 619 other_arch = archetype::find (f.get_str ());
603 620
604 if (!other_arch) 621 if (!other_arch)
605 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 622 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
623 }
606 break; 624 break;
607 625
608 case KW_owner: 626 case KW_owner:
609 f.delayed_deref (this, owner, f.get_str ()); 627 f.delayed_deref (this, owner, f.get_str ());
610 break; 628 break;
… …
614 CLEAR_FLAG (this, FLAG_ANIMATE); 632 CLEAR_FLAG (this, FLAG_ANIMATE);
615 animation_id = 0; 633 animation_id = 0;
616 634
617 const char *str = f.get_str (); 635 const char *str = f.get_str ();
618 if (str && (animation_id = find_animation (str))) 636 if (str && (animation_id = find_animation (str)))
619 SET_FLAG (this, FLAG_ANIMATE); 637 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
620 } 638 }
621 break; 639 break;
622 640
623 case KW_last_heal: f.get (last_heal); break; 641 case KW_last_heal: f.get (last_heal); break;
624 case KW_last_sp: f.get (last_sp); break; 642 case KW_last_sp: f.get (last_sp); break;
… …
813 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 831 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
814 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 832 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
815 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 833 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
816 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 834 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
817 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 835 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
836 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
818 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 837 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
819 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 838 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
820 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 839 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
821 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 840 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
822 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 841 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
922 case KW_anim_speed: f.get (anim_speed); break; 941 case KW_anim_speed: f.get (anim_speed); break;
923 case KW_container: f.get (weight_limit); break; 942 case KW_container: f.get (weight_limit); break;
924 case KW_will_apply: f.get (will_apply); break; 943 case KW_will_apply: f.get (will_apply); break;
925 case KW_attack_movement: f.get (attack_movement); break; 944 case KW_attack_movement: f.get (attack_movement); break;
926 case KW_move_state: f.get (move_status); break; 945 case KW_move_state: f.get (move_status); break;
927 case KW_expmul: f.get (expmul); break; 946 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
928 case KW_glow_radius: f.get (glow_radius); break; 947 case KW_glow_radius: f.get (glow_radius); break;
929 case KW_weapontype: f.get (weapontype); break; 948 case KW_weapontype: f.get (weapontype); break;
930 case KW_tooltype: f.get (tooltype); break;
931 case KW_casting_time: f.get (casting_time); break; 949 case KW_casting_time: f.get (casting_time); break;
950
951 // elevation is deprecated
932 case KW_elevation: f.get (elevation); break; 952 case KW_elevation: break;
953
933 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 954 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
934 case KW_client_type: f.get (client_type); break; 955 case KW_client_type: f.get (client_type); break;
935 case KW_duration: f.get (duration); break; 956 case KW_duration: f.get (duration); break;
936 case KW_range: f.get (range); break; 957 case KW_range: f.get (range); break;
937 case KW_range_modifier: f.get (range_modifier); break; 958 case KW_range_modifier: f.get (range_modifier); break;
… …
956 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 977 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
957 case KW_can_apply: 978 case KW_can_apply:
958 break; 979 break;
959 980
960 case KW_connected: 981 case KW_connected:
961 add_button_link (this, map, f.get_sint32 ()); 982 {
983 shstr connected;
984
985 f.get (connected);
986 add_link (map, connected);
987 }
962 break; 988 break;
963 989
964 case KW_randomitems: 990 case KW_randomitems:
965 if (f.get_str ()) 991 if (f.get_str ())
966 { 992 {
… …
968 loading_arch 994 loading_arch
969 ? treasurelist::get (f.get_str ()) 995 ? treasurelist::get (f.get_str ())
970 : treasurelist::find (f.get_str ()); 996 : treasurelist::find (f.get_str ());
971 997
972 if (!randomitems) 998 if (!randomitems)
999 {
973 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 }
974 } 1003 }
975 else 1004 else
976 randomitems = 0; 1005 randomitems = 0;
977 break; 1006 break;
978 1007
… …
994 1023
995 f.next (); 1024 f.next ();
996 return true; 1025 return true;
997 1026
998 case KW_ERROR: 1027 case KW_ERROR:
999 set_ob_key_value (this, f.kw_str, f.value, true); 1028 // append as key value pair (do not use kv_set as it prepends)
1029 // we also do not even try to find old values, duplicate keys stay duplicate
1030 {
1031 key_value *kv = new key_value;
1032
1033 kv->next = 0;
1034 kv->key = shstr (f.kw_str);
1035 kv->value = shstr (f.value);
1036
1037 if (!last_kv)
1038 key_values = last_kv = kv;
1039 else
1040 {
1041 while (last_kv->next)
1042 last_kv = last_kv->next;
1043
1044 last_kv->next = kv;
1045 last_kv = kv;
1046 }
1047 }
1000 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1048 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1001 break; 1049 break;
1002 1050
1003 default: 1051 default:
1004 if (!f.parse_error ("object", name)) 1052 if (!f.parse_error ("object", name))
… …
1025 1073
1026 assert (arch); //D maybe use exception handling of sorts? 1074 assert (arch); //D maybe use exception handling of sorts?
1027 1075
1028 f.next (); 1076 f.next ();
1029 1077
1030 object *op = object::create (); 1078 object *op = arch->instance ();
1031
1032 op->map = map; 1079 op->map = map;
1033 arch->copy_to (op);
1034 // copy_to activates, this should be fixed properly 1080 // instance() activates, this should be fixed properly
1035 op->deactivate (); 1081 op->deactivate ();
1036 1082
1037 if (!op->parse_kv (f)) 1083 if (!op->parse_kv (f))
1038 { 1084 {
1039 op->destroy (true); 1085 op->destroy ();
1040 return 0; 1086 return 0;
1041 } 1087 }
1042 1088
1043 op->post_load_check (); 1089 op->post_load_check ();
1044 return op; 1090 return op;
… …
1249 /* 110 */ 1295 /* 110 */
1250 KW_destroy_on_death, 1296 KW_destroy_on_death,
1251 KW_NULL, 1297 KW_NULL,
1252 }; 1298 };
1253 1299
1254 int i;
1255
1256 /* This saves the key/value lists. We do it first so that any 1300 /* This saves the key/value lists. We do it first so that any
1257 * keys that match field names will be overwritten by the loader. 1301 * keys that match field names will be overwritten by the loader.
1258 */ 1302 */
1259 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1303 for (key_value *kv = op->key_values; kv; kv = kv->next)
1260 { 1304 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1261 /* Find the field in the opposing member. */ 1305 f.put (kv->key, kv->value);
1262 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1263
1264 /* If there's no partnering field, or it's got a different value, save our field. */
1265 if (!arch_field || my_field->value != arch_field->value)
1266 f.put (my_field->key, my_field->value);
1267 }
1268 1306
1269 /* 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
1270 * will get taken care of the copy_to method. 1308 * will get taken care of the copy_to method.
1271 */ 1309 */
1272 1310
1273 { 1311 if (op->uuid)
1274 char uids[64]; 1312 f.put (KW_uuid, op->uuid.c_str ());
1275 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1276 f.put (KW_uuid, (const char *)uids);
1277 }
1278 1313
1279#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)
1280#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)
1281 1316
1282 if (object *owner = op->owner) 1317 if (object *owner = op->owner)
… …
1285 CMP_OUT (name); 1320 CMP_OUT (name);
1286 CMP_OUT (name_pl); 1321 CMP_OUT (name_pl);
1287 CMP_OUT (custom_name); 1322 CMP_OUT (custom_name);
1288 CMP_OUT (title); 1323 CMP_OUT (title);
1289 CMP_OUT (race); 1324 CMP_OUT (race);
1325 CMP_OUT (skill);
1290 CMP_OUT (slaying); 1326 CMP_OUT (slaying);
1291 CMP_OUT (tag); 1327 CMP_OUT (tag);
1292 CMP_OUT (other_arch); 1328 CMP_OUT (other_arch);
1293 1329
1294 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1330 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
… …
1297 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1333 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1298 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1334 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1299 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1335 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1300 1336
1301 if (op->animation_id != tmp->animation_id) 1337 if (op->animation_id != tmp->animation_id)
1302 if (op->animation_id) 1338 if (op->has_anim ())
1339 f.put (KW_animation, op->anim ().name);
1340 else
1303 { 1341 {
1304 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1342 f.put (KW_animation, (const char *)0);
1305 1343 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1306 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1307 f.put (KW_is_animated, (sint32)0);
1308 } 1344 }
1309 else
1310 f.put (KW_animation, (const char *)0);
1311 1345
1312 CMP_OUT2 (str, stats.Str); 1346 CMP_OUT2 (str, stats.Str);
1313 CMP_OUT2 (dex, stats.Dex); 1347 CMP_OUT2 (dex, stats.Dex);
1314 CMP_OUT2 (con, stats.Con); 1348 CMP_OUT2 (con, stats.Con);
1315 CMP_OUT2 (wis, stats.Wis); 1349 CMP_OUT2 (wis, stats.Wis);
… …
1345 CMP_OUT (direction); 1379 CMP_OUT (direction);
1346 CMP_OUT (type); 1380 CMP_OUT (type);
1347 CMP_OUT (subtype); 1381 CMP_OUT (subtype);
1348 CMP_OUT (attacktype); 1382 CMP_OUT (attacktype);
1349 1383
1350 for (i = 0; i < NROFATTACKS; i++) 1384 for (int i = 0; i < NROFATTACKS; i++)
1351 if (expect_false (op->resist[i] != tmp->resist[i])) 1385 if (expect_false (op->resist[i] != tmp->resist[i]))
1352 f.put (resist_save[i], op->resist[i]); 1386 f.put (resist_save[i], op->resist[i]);
1353 1387
1354 CMP_OUT (path_attuned); 1388 CMP_OUT (path_attuned);
1355 CMP_OUT (path_repelled); 1389 CMP_OUT (path_repelled);
… …
1366 CMP_OUT (last_sp); 1400 CMP_OUT (last_sp);
1367 CMP_OUT (last_grace); 1401 CMP_OUT (last_grace);
1368 CMP_OUT (last_eat); 1402 CMP_OUT (last_eat);
1369 CMP_OUT (glow_radius); 1403 CMP_OUT (glow_radius);
1370 1404
1371 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1405 if (op->flag [FLAG_IS_LINKED])
1406 if (auto (ol, op->find_link ()))
1372 f.put (KW_connected, i); 1407 f.put (KW_connected, ol->id);
1373 1408
1374 CMP_OUT (randomitems); 1409 CMP_OUT (randomitems);
1375 CMP_OUT2 (container, weight_limit); 1410 CMP_OUT2 (container, weight_limit);
1376 1411
1377 CMP_OUT (run_away); 1412 CMP_OUT (run_away);
1378 CMP_OUT (pick_up); 1413 CMP_OUT (pick_up);
1379 CMP_OUT (will_apply); 1414 CMP_OUT (will_apply);
1380 CMP_OUT (smoothlevel); 1415 CMP_OUT (smoothlevel);
1381 CMP_OUT (weapontype); 1416 CMP_OUT (weapontype);
1382 CMP_OUT (tooltype);
1383 CMP_OUT (elevation);
1384 CMP_OUT (client_type); 1417 CMP_OUT (client_type);
1385 CMP_OUT (item_power); 1418 CMP_OUT (item_power);
1386 CMP_OUT (duration); 1419 CMP_OUT (duration);
1387 CMP_OUT (range); 1420 CMP_OUT (range);
1388 CMP_OUT (range_modifier); 1421 CMP_OUT (range_modifier);
… …
1397 CMP_OUT (move_off); 1430 CMP_OUT (move_off);
1398 CMP_OUT (move_slow); 1431 CMP_OUT (move_slow);
1399 CMP_OUT (move_slow_penalty); 1432 CMP_OUT (move_slow_penalty);
1400 1433
1401 if (op->flag != tmp->flag) 1434 if (op->flag != tmp->flag)
1402 for (i = 0; i <= NUM_FLAGS; i++) 1435 for (int i = 0; i <= NUM_FLAGS; i++)
1403 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1436 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1404 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1437 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1405 1438
1406 // save body locations 1439 // save body locations
1407 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1440 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1408 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1441 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1409 f.put (body_locations[i].save_name, op->slot[i].info); 1442 f.put (body_locations[i].save_name, op->slot[i].info);
1410} 1443}
1411 1444
1412/* 1445/*
… …
1415 * 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.
1416 */ 1449 */
1417bool 1450bool
1418object::write (object_freezer &f) 1451object::write (object_freezer &f)
1419{ 1452{
1420 archetype *at = arch ? (archetype *)arch : empty_archetype; 1453 if (is_arch ())
1421 1454 {
1455 f.put (KW_object, arch->archname);
1456 write_diff (f, this, archetype::empty);
1457 }
1458 else
1459 {
1422 f.put (KW_arch, at->archname); 1460 f.put (KW_arch, arch->archname);
1423 write_diff (f, this, at); 1461 write_diff (f, this, arch);
1462 }
1424 1463
1425 for (object *tmp = inv; tmp; tmp = tmp->below) 1464 for (object *tmp = inv; tmp; tmp = tmp->below)
1426 tmp->write (f); 1465 tmp->write (f);
1427 1466
1428 f.put (this); 1467 f.put (this);
… …
1433 1472
1434///////////////////////////////////////////////////////////////////////////// 1473/////////////////////////////////////////////////////////////////////////////
1435 1474
1436// generic resource file load, 1475// generic resource file load,
1437// currently supports: region, treasures, archetypes 1476// currently supports: region, treasures, archetypes
1477bool
1438bool load_resource_file (const char *filename) 1478load_resource_file_ (const char *filename)
1439{ 1479{
1440 object_thawer f (filename); 1480 object_thawer f (filename);
1441
1442 bool success = false;
1443 bool seen_arch = false;
1444 1481
1445 for (;;) 1482 for (;;)
1446 { 1483 {
1447 switch (f.kw) 1484 switch (f.kw)
1448 { 1485 {
1449 case KW_region: 1486 case KW_region:
1450 if (!region::read (f)) 1487 if (!region::read (f))
1451 goto finish; 1488 return false;
1452 break; 1489 break;
1453 1490
1454 case KW_treasure: 1491 case KW_treasure:
1455 case KW_treasureone: 1492 case KW_treasureone:
1456 if (!treasurelist::read (f)) 1493 if (!treasurelist::read (f))
1457 goto finish; 1494 return false;
1458 break; 1495 break;
1459 1496
1460 case KW_object: 1497 case KW_object:
1461 seen_arch = true;
1462 if (!archetype::read (f)) 1498 if (!archetype::read (f))
1463 goto finish; 1499 return false;
1464 break; 1500 break;
1465 1501
1466 case KW_EOF: 1502 case KW_EOF:
1467 success = true; 1503 return true;
1468 goto finish;
1469 1504
1470 default: 1505 default:
1471 if (!f.parse_error ("resource file")) 1506 if (!f.parse_error ("resource file"))
1472 goto finish; 1507 return false;
1473 1508
1474 f.next (); 1509 f.next ();
1475 break; 1510 break;
1476 } 1511 }
1477 } 1512 }
1478
1479finish:
1480 if (seen_arch)
1481 init_archetype_pointers ();
1482
1483 return success;
1484} 1513}
1485 1514

Diff Legend

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