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

11
src/invent.c
View File

@@ -1252,10 +1252,7 @@ is_worn(otmp)
register struct obj *otmp;
{
return((boolean)(!!(otmp->owornmask & (W_ARMOR | W_RING | W_AMUL | W_TOOL |
#ifdef STEED
W_SADDLE |
#endif
W_WEP | W_SWAPWEP | W_QUIVER))));
W_SADDLE | W_WEP | W_SWAPWEP | W_QUIVER))));
}
/* extra xprname() input that askchain() can't pass through safe_qbuf() */
@@ -2803,11 +2800,7 @@ STATIC_OVL boolean
tool_in_use(obj)
struct obj *obj;
{
if ((obj->owornmask & (W_TOOL
#ifdef STEED
| W_SADDLE
#endif
)) != 0L) return TRUE;
if ((obj->owornmask & (W_TOOL | W_SADDLE)) != 0L) return TRUE;
if (obj->oclass != TOOL_CLASS) return FALSE;
return (boolean)(obj == uwep || obj->lamplit ||
(obj->otyp == LEASH && obj->leashmon));