| … | |
… | |
| 385 | if (ip > 2 * item_power && ip > (item_power + 3)) |
385 | if (ip > 2 * item_power && ip > (item_power + 3)) |
| 386 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
386 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
| 387 | #endif |
387 | #endif |
| 388 | } |
388 | } |
| 389 | |
389 | |
| 390 | /* Old spellcasting object - need to load in the appropiate object */ |
390 | /* old style spellcasting object (pretty common) - need to load in the appropiate object */ |
| 391 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
391 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
|
|
392 | if ((type == ROD |
|
|
393 | || type == WAND |
|
|
394 | || type == SCROLL |
|
|
395 | || type == HORN |
|
|
396 | || type == FIREWALL |
| 392 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
397 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
| 393 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
398 | || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet. |
|
|
399 | && !inv |
|
|
400 | && !loading_arch |
|
|
401 | && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here! |
|
|
402 | // TODO: at least one watchout-comments is redundant - investigate/remove |
| 394 | { |
403 | { |
|
|
404 | // TODO: fix firewall object on map |
| 395 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
405 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
| 396 | * in that spell was stored in sp. |
406 | * in that spell was stored in sp. |
| 397 | */ |
407 | */ |
| 398 | LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
408 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
| 399 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
409 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
| 400 | insert_ob_in_ob (tmp, this); |
410 | insert_ob_in_ob (tmp, this); |
| 401 | randomitems = NULL; /* So another spell isn't created for this object */ |
411 | randomitems = 0; |
| 402 | } |
412 | } |
| 403 | |
413 | |
| 404 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
414 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
| 405 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
415 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
| 406 | { |
416 | { |
| … | |
… | |
| 550 | case KW_race: f.get_ornull (race); break; |
560 | case KW_race: f.get_ornull (race); break; |
| 551 | case KW_slaying: f.get_ornull (slaying); break; |
561 | case KW_slaying: f.get_ornull (slaying); break; |
| 552 | case KW_tag: f.get_ornull (tag); break; |
562 | case KW_tag: f.get_ornull (tag); break; |
| 553 | |
563 | |
| 554 | case KW_arch: |
564 | case KW_arch: |
| 555 | { |
|
|
| 556 | object *tmp = object::read (f); |
565 | if (object *tmp = object::read (f)) |
| 557 | tmp->deactivate (); |
|
|
| 558 | |
|
|
| 559 | { |
566 | { |
|
|
567 | tmp->deactivate (); |
|
|
568 | |
| 560 | // was: insert_ob_in_ob (tmp, op); |
569 | // was: insert_ob_in_ob (tmp, op); |
| 561 | // but manually adding it can improve map loading times a lot |
570 | // but manually adding it can improve map loading times a lot |
| 562 | // also, appending instead of prepending keeps the |
571 | // also, appending instead of prepending keeps the |
| 563 | // save ordering the same between repeated load/saves. |
572 | // save ordering the same between repeated load/saves. |
| 564 | // and finally we do not want any funny effects |
573 | // and finally we do not want any funny effects |
| … | |
… | |
| 581 | |
590 | |
| 582 | tmp->below = 0; |
591 | tmp->below = 0; |
| 583 | tmp->env = this; |
592 | tmp->env = this; |
| 584 | op_inv = tmp; |
593 | op_inv = tmp; |
| 585 | } |
594 | } |
| 586 | } |
595 | else |
|
|
596 | LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n"); |
|
|
597 | |
| 587 | continue; |
598 | continue; |
| 588 | |
599 | |
| 589 | case KW_other_arch: |
600 | case KW_other_arch: |
| 590 | if (loading_arch == this) |
601 | if (loading_arch == this) |
| 591 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
602 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
| … | |
… | |
| 1048 | // instance() activates, this should be fixed properly |
1059 | // instance() activates, this should be fixed properly |
| 1049 | op->deactivate (); |
1060 | op->deactivate (); |
| 1050 | |
1061 | |
| 1051 | if (!op->parse_kv (f)) |
1062 | if (!op->parse_kv (f)) |
| 1052 | { |
1063 | { |
| 1053 | op->destroy (true); |
1064 | op->destroy (); |
| 1054 | return 0; |
1065 | return 0; |
| 1055 | } |
1066 | } |
| 1056 | |
1067 | |
| 1057 | op->post_load_check (); |
1068 | op->post_load_check (); |
| 1058 | return op; |
1069 | return op; |
