| … | |
… | |
| 395 | || type == FIREWALL |
395 | || type == FIREWALL |
| 396 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
396 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
| 397 | || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet. |
397 | || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet. |
| 398 | && !inv |
398 | && !inv |
| 399 | && !loading_arch |
399 | && !loading_arch |
| 400 | && !randomitems) // by elmex: not _any_ rod or horn we find on a map, which has randomitems is an old spellcasting |
400 | && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here! |
| 401 | // object. For instance lythanders pipe got it's spell in the treasurelist in the randomitems, |
|
|
| 402 | // same goes for normal rods. |
|
|
| 403 | { |
401 | { |
| 404 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
402 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
| 405 | * in that spell was stored in sp. |
403 | * in that spell was stored in sp. |
| 406 | */ |
404 | */ |
| 407 | LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
405 | LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
| 408 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
406 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
| 409 | insert_ob_in_ob (tmp, this); |
407 | insert_ob_in_ob (tmp, this); |
|
|
408 | randomitems = 0; |
| 410 | } |
409 | } |
| 411 | |
410 | |
| 412 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
411 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
| 413 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
412 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
| 414 | { |
413 | { |
