From f3ea3473859e35a5d232c1a075af8af2646867a1 Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Fri, 27 Apr 2007 15:37:59 +0000
Subject: Refix quarterstaff damage fix.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1384 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/fight.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'crawl-ref/source/fight.cc')

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 6f47554dea..a1cd6669b7 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2427,8 +2427,12 @@ int melee_attack::player_calc_base_weapon_damage()
 
     // Quarterstaves can be wielded with a worn shield, but are much
     // less effective.
-    if (shield && hands_reqd(*weapon, player_size()) == HANDS_TWO)
-        damage /= 3;
+    if (shield && weapon->base_type == OBJ_WEAPONS
+        && weapon->sub_type == WPN_QUARTERSTAFF
+        && hands_reqd(*weapon, player_size()) == HANDS_HALF)
+    {
+        damage /= 2;
+    }
 
     return (damage);
 }
-- 
cgit v1.2.3-54-g00ecf