From: nethack.allison <nethack.allison>
Date: Sat, 15 Feb 2003 23:34:37 +0000 (+0000)
Subject: macro arrangement bit
X-Git-Tag: MOVE2GIT~2170
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f505101fa3a2c73e7ef32a1105dae0e27e616735;p=nethack

macro arrangement bit
---

diff --git a/include/obj.h b/include/obj.h
index 45c27a5bf..de0e7489f 100644
--- a/include/obj.h
+++ b/include/obj.h
@@ -185,12 +185,6 @@ struct obj {
 				|| (otmp)->otyp == ELVEN_CLOAK\
 				|| (otmp)->otyp == ELVEN_SHIELD\
 				|| (otmp)->otyp == ELVEN_BOOTS)
-#define is_elven_weapon(otmp)	((otmp)->otyp == ELVEN_ARROW\
-				|| (otmp)->otyp == ELVEN_SPEAR\
-				|| (otmp)->otyp == ELVEN_DAGGER\
-				|| (otmp)->otyp == ELVEN_SHORT_SWORD\
-				|| (otmp)->otyp == ELVEN_BROADSWORD\
-				|| (otmp)->otyp == ELVEN_BOW)
 #define is_orcish_armor(otmp)	((otmp)->otyp == ORCISH_HELM\
 				|| (otmp)->otyp == ORCISH_CHAIN_MAIL\
 				|| (otmp)->otyp == ORCISH_RING_MAIL\
@@ -236,13 +230,13 @@ struct obj {
 #define Dragon_to_scales(pm)	(GRAY_DRAGON_SCALES + (pm - mons))
 
 /* Elven gear */
-#define is_elven_obj(otmp)	(is_elven_armor(otmp)\
-				|| (otmp)->otyp == ELVEN_ARROW\
+#define is_elven_weapon(otmp)	((otmp)->otyp == ELVEN_ARROW\
 				|| (otmp)->otyp == ELVEN_SPEAR\
 				|| (otmp)->otyp == ELVEN_DAGGER\
 				|| (otmp)->otyp == ELVEN_SHORT_SWORD\
 				|| (otmp)->otyp == ELVEN_BROADSWORD\
 				|| (otmp)->otyp == ELVEN_BOW)
+#define is_elven_obj(otmp)	(is_elven_armor(otmp) || is_elven_weapon(otmp))
 
 /* Orcish gear */
 #define is_orcish_obj(otmp)	(is_orcish_armor(otmp)\