[1958923] If player can't wield weapon without a shield, don't give any messages about not being able to wield the weapon because a shield is equipped.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index ca537e4443..c83392ec3a 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -129,12 +129,6 @@ bool can_wield(const item_def *weapon, bool say_reason,
         }
     }
 
-    if (!ignore_temporary_disability && is_shield_incompatible(*weapon))
-    {
-        SAY(mpr("You can't wield that with a shield."));
-        return (false);
-    }
-
     // We don't have to check explicitly for staves - all staves are wieldable
     // by everyone.
     if (weapon->base_type != OBJ_WEAPONS)
@@ -176,6 +170,12 @@ bool can_wield(const item_def *weapon, bool say_reason,
         return false;
     }
 
+    if (!ignore_temporary_disability && is_shield_incompatible(*weapon))
+    {
+        SAY(mpr("You can't wield that with a shield."));
+        return (false);
+    }
+
     // We can wield this weapon. Phew!
     return true;