macro arrangement bit
This commit is contained in:
@@ -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)\
|
||||
|
||||
Reference in New Issue
Block a user