diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 18:31:03 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-15 18:31:03 +0000 |
| commit | c607f86c3013a65b0888227c8f6385ce72ce0177 (patch) | |
| tree | 8b616564b3e07abeafe0d407e08b873f99482f54 /crawl-ref/source/item_use.cc | |
| parent | 3363a19596a74e799fe35c3e0cf59f82fe56664f (diff) | |
| download | crawl-ref-c607f86c3013a65b0888227c8f6385ce72ce0177.tar.gz crawl-ref-c607f86c3013a65b0888227c8f6385ce72ce0177.zip | |
Fix 2018757: Bat form not deactivating jewellery effects
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6564 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index f77688b29e..00eb067077 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3166,9 +3166,9 @@ bool puton_ring(int slot, bool prompt_finger) return (false); return puton_item(item_slot, prompt_finger); -} // end puton_ring() +} -void jewellery_remove_effects(item_def &item) +void jewellery_remove_effects(item_def &item, bool mesg) { // The ring/amulet must already be removed from you.equip at this point. @@ -3177,7 +3177,8 @@ void jewellery_remove_effects(item_def &item) const bool old_showuncursed = Options.show_uncursed; Options.show_uncursed = false; - mprf("You remove %s.", item.name(DESC_NOCAP_YOUR).c_str() ); + if (mesg) + mprf("You remove %s.", item.name(DESC_NOCAP_YOUR).c_str() ); Options.show_uncursed = old_showuncursed; @@ -3246,7 +3247,7 @@ void jewellery_remove_effects(item_def &item) if (is_random_artefact(item)) unuse_randart(item); - // must occur after ring is removed -- bwr + // Must occur after ring is removed. -- bwr calc_mp(); } |