Apply commits r6564 and r6567 to 0.4 trunk.

Also start on changes.stone_soup for 0.4.1. The mapmark.lua fixes are
not actually in 0.4 trunk, are they? 


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6568 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 8 insertions, 6 deletions

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index cf2efd52d2..e449ce82cd 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -3171,9 +3171,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.
 
@@ -3182,7 +3182,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;
 
@@ -3251,7 +3252,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();
 }
 
@@ -4109,9 +4110,10 @@ static bool _handle_enchant_armour( int item_slot )
                                         OSEL_ENCH_ARM, true, true, false );
     }
 
-    if (item_slot == -1)
+    if (item_slot == PROMPT_ABORT || item_slot == PROMPT_NOTHING)
     {
-        canned_msg( MSG_OK );
+        if (item_slot == PROMPT_ABORT)
+            canned_msg( MSG_OK );
         return (false);
     }