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

Make TOURIST unconditional.

Browse Source
This commit is contained in:
Sean Hunt
2015-02-13 23:31:41 -05:00
committed by Pasi Kallinen
parent 44ca9fc16a
commit bb647dc33c
43 changed files with 27 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/steal.c
View File

@@ -13,10 +13,7 @@ STATIC_OVL const char *
equipname(otmp)
register struct obj *otmp;
{
return (
#ifdef TOURIST
(otmp == uarmu) ? "shirt" :
#endif
return ((otmp == uarmu) ? "shirt" :
(otmp == uarmf) ? "boots" :
(otmp == uarms) ? "shield" :
(otmp == uarmg) ? "gloves" :
@@ -231,9 +228,7 @@ boolean unchain_ball; /* whether to unpunish or just unwield */
else if (obj == uarmg) (void) Gloves_off();
else if (obj == uarmh) (void) Helmet_off();
else if (obj == uarms) (void) Shield_off();
#ifdef TOURIST
else if (obj == uarmu) (void) Shirt_off();
#endif
/* catchall -- should never happen */
else setworn((struct obj *)0, obj->owornmask & W_ARMOR);
} else if (obj->owornmask & W_AMUL) {
@@ -342,11 +337,9 @@ nothing_to_steal:
if (otmp == uarmg && uwep) otmp = uwep;
/* can't steal armor while wearing cloak - so steal the cloak. */
else if(otmp == uarm && uarmc) otmp = uarmc;
#ifdef TOURIST
/* can't steal shirt while wearing cloak or suit */
else if(otmp == uarmu && uarmc) otmp = uarmc;
else if(otmp == uarmu && uarm) otmp = uarm;
#endif
gotobj:
if(otmp->o_id == stealoid) return(0);