nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Test cvs script patch mailer

Browse Source 
Move an is_elven_* macro definition to the same spot as the other ones
so future elven equipment changes can be done in one place.
This commit is contained in:
nethack.allison
2003-01-17 03:40:47 +00:00
parent e9c25be839
commit d3dfe5dfc8
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/obj.h
View File

@@ -185,6 +185,12 @@ 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\

9
src/wield.c
View File

@@ -52,14 +52,6 @@
STATIC_DCL int FDECL(ready_weapon, (struct obj *));
/* elven weapons vibrate warningly when enchanted beyond a limit */
#define is_elven_weapon(optr) ((optr)->otyp == ELVEN_ARROW\
|| (optr)->otyp == ELVEN_SPEAR\
|| (optr)->otyp == ELVEN_DAGGER\
|| (optr)->otyp == ELVEN_SHORT_SWORD\
|| (optr)->otyp == ELVEN_BROADSWORD\
|| (optr)->otyp == ELVEN_BOW)
/* used by will_weld() */
/* probably should be renamed */
#define erodeable_wep(optr) ((optr)->oclass == WEAPON_CLASS \
@@ -701,6 +693,7 @@ register int amount;
}
/* an elven magic clue, cookie@keebler */
/* elven weapons vibrate warningly when enchanted beyond a limit */
if ((uwep->spe > 5)
&& (is_elven_weapon(uwep) || uwep->oartifact || !rn2(7)))
Your("%s unexpectedly.",