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

Make STEED unconditional.

Browse Source
This commit is contained in:
Sean Hunt
2015-02-13 21:23:56 -05:00
committed by Pasi Kallinen
parent aba6ecb7b3
commit 9759f5bf6d
62 changed files with 98 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/wield.c
View File

@@ -106,10 +106,7 @@ register struct obj *obj;
unweapon = (obj->oclass == WEAPON_CLASS) ?
is_launcher(obj) || is_ammo(obj) ||
is_missile(obj) || (is_pole(obj)
#ifdef STEED
&& !u.usteed
#endif
) : !is_weptool(obj);
&& !u.usteed) : !is_weptool(obj);
} else
unweapon = TRUE; /* for "bare hands" message */
update_inventory();
@@ -288,11 +285,7 @@ dowield()
return (doswapweapon());
else if (wep == uquiver)
setuqwep((struct obj *) 0);
else if (wep->owornmask & (W_ARMOR | W_RING | W_AMUL | W_TOOL
#ifdef STEED
| W_SADDLE
#endif
)) {
else if (wep->owornmask & (W_ARMOR | W_RING | W_AMUL | W_TOOL | W_SADDLE)) {
You("cannot wield that!");
return (0);
}
@@ -392,10 +385,7 @@ dowieldquiver()
!is_plural(uwep) ? "That is" : "They are");
return(0);
} else if (newquiver->owornmask & (W_ARMOR | W_RING | W_AMUL | W_TOOL
#ifdef STEED
| W_SADDLE
#endif
)) {
| W_SADDLE)) {
You("cannot ready that!");
return (0);
} else {