[1747469] You shouldn't even try to take off your cloak when swapping

armour if the armour is cursed.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1744 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 8 insertions, 0 deletions

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index febacf4c5a..a5593022d4 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -887,6 +887,14 @@ bool do_wear_armour( int item, bool quiet )
     if (slot == EQ_BODY_ARMOUR
         && you.equip[EQ_CLOAK] != -1 && !cloak_is_being_removed())
     {
+        if ( you.equip[EQ_BODY_ARMOUR] &&
+             item_cursed(you.inv[you.equip[EQ_BODY_ARMOUR]]) )
+        {
+            if ( !quiet )
+                mprf("%s is stuck to your body!",
+                     you.inv[you.equip[EQ_BODY_ARMOUR]].name(DESC_CAP_YOUR).c_str());
+            return (false);
+        }
         if (!item_cursed( you.inv[you.equip[EQ_CLOAK]] ))
         {
             cloak = you.equip[ EQ_CLOAK ];