Disallow wearing shields with two-handed launchers.

This renders it unnecessary to try and preserve the impact of shields on
launcher delay.

A fair bit of now-dead code goes away as a result as well.

1 files changed, 0 insertions, 6 deletions

diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc
index f9fc3a8db0..8a1c4a4508 100644
--- a/crawl-ref/source/player-equip.cc
+++ b/crawl-ref/source/player-equip.cc
@@ -681,9 +681,6 @@ static void _equip_weapon_effect(item_def& item, bool showMsgs, bool unmeld)
         break;
     }
 
-    if (showMsgs)
-        warn_shield_penalties();
-
     you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0;
 }
 
@@ -992,9 +989,6 @@ static void _equip_armour_effect(item_def& arm, bool unmeld)
         }
     }
 
-    if (get_item_slot(arm) == EQ_SHIELD)
-        warn_shield_penalties();
-
     you.redraw_armour_class = true;
     you.redraw_evasion = true;
 }