From: cohrs <cohrs>
Date: Wed, 21 May 2003 22:08:22 +0000 (+0000)
Subject: B03003 - throwing short swords
X-Git-Tag: MOVE2GIT~1966
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac3746d05514fb83bc46c6c8ec51b01a0819abe1;p=nethack

B03003 - throwing short swords
<Someone> pointed out a disagreement between the comment and code in
throwing_weapon(): comment says daggers & knife can be thrown, but
code also allowed short swords.  Assuming the comment was correct, changed
the code to match.
---

diff --git a/doc/fixes34.2 b/doc/fixes34.2
index 8779aad49..fb1e79432 100644
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -73,6 +73,7 @@ clarify disclose option default in opthelp, and support "all" as old help said
 add more calls to update_inventory as the inventory changes
 don't charge for items picked up from monster's interior while swallowed
 choking while eating non-food always called the food "quick snack"
+short swords are not throwing weapons
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/dothrow.c b/src/dothrow.c
index 24bdae312..f81e307c3 100644
--- a/src/dothrow.c
+++ b/src/dothrow.c
@@ -821,10 +821,11 @@ throwing_weapon(obj)
 struct obj *obj;
 {
 	return (is_missile(obj) || is_spear(obj) ||
-			/* daggers and knife (excludes scalpel) */
-			(is_blade(obj) && (objects[obj->otyp].oc_dir & PIERCE)) ||
-			/* special cases [might want to add AXE] */
-			obj->otyp == WAR_HAMMER || obj->otyp == AKLYS);
+		/* daggers and knife (excludes scalpel) */
+		(is_blade(obj) && !is_sword(obj) &&
+		 (objects[obj->otyp].oc_dir & PIERCE)) ||
+		/* special cases [might want to add AXE] */
+		obj->otyp == WAR_HAMMER || obj->otyp == AKLYS);
 }
 
 /* the currently thrown object is returning to you (not for boomerangs) */