Consolidate the routines to remove the player's condensation shield into

one function.


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

1 files changed, 4 insertions, 5 deletions

diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 8ffc76b8a8..1ecb5c8cf0 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -35,6 +35,7 @@
 #include "player.h"
 #include "randart.h"
 #include "religion.h"
+#include "spells4.h"
 #include "spl-util.h"
 #include "stash.h"
 #include "state.h"
@@ -1274,11 +1275,9 @@ void armour_wear_effects(const int item_slot)
     }
     else if (eq_slot == EQ_SHIELD)
     {
-        if (you.duration[DUR_CONDENSATION_SHIELD])
-        {
-            mpr( "Your icy shield evaporates.", MSGCH_DURATION );
-            you.duration[DUR_CONDENSATION_SHIELD] = 0;
-        }
+        if (you.duration[DUR_CONDENSATION_SHIELD] > 0)
+            remove_condensation_shield();
+
         you.equip[EQ_SHIELD] = item_slot;
     }
     else if (!melded)