diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-20 00:57:48 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-20 00:57:48 +0000 |
commit | fb2de3b69218f690d6e3fe70da95b6d895dc9209 (patch) | |
tree | 3af969101fc67a3fbf38c11b28d2b990b5f290a8 /crawl-ref | |
parent | 488e5fd789582bc4a9c82f11abf81fde83e43631 (diff) | |
download | crawl-ref-fb2de3b69218f690d6e3fe70da95b6d895dc9209.tar.gz crawl-ref-fb2de3b69218f690d6e3fe70da95b6d895dc9209.zip |
Add a missing break statement to fix unID'd scroll of recharging enchanting
armour instead... oops!
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4395 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-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 } |