diff options
| -rw-r--r-- | crawl-ref/source/item_use.cc | 9 | ||||
| -rw-r--r-- | crawl-ref/source/itemprop.cc | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 902565deed..fce561faac 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -4004,20 +4004,25 @@ static bool scroll_modify_item(const scroll_type scroll) case SCR_RECHARGING: if (item_is_rechargable(item)) { - // might still fail on highly enchanted weapons of electrocution + // Might still fail on highly enchanted weapons of electrocution. + // (If so, already prints the "Nothing happens" message.) if (recharge_wand(item_slot)) return (true); return (false); } + break; case SCR_ENCHANT_ARMOUR: if (is_enchantable_armour(item, true)) { - // might still fail because of already high enchantment + // Might still fail because of already high enchantment. + // (If so, already prints the "Nothing happens" message.) if (_handle_enchant_armour(item_slot)) return (true); return (false); } + break; default: + mpr("Buggy scroll can't modify item!"); break; } diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 11229f3b20..e1b2388b4c 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -1333,8 +1333,8 @@ bool is_enchantable_weapon(const item_def &wpn, bool uncurse) } // Nor can highly enchanted items (missiles only have one stat) - if ( wpn.plus >= 9 || - (wpn.base_type == OBJ_WEAPONS && wpn.plus2 >= 9) ) + if ( wpn.plus >= 9 + || wpn.base_type == OBJ_WEAPONS && wpn.plus2 >= 9 ) { return (uncurse && item_cursed( wpn )); // ?EW may uncurse items } |