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
parent 5ee71d2757
commit 260f7ea860
43 changed files with 27 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/uhitm.c
View File

@@ -67,10 +67,8 @@ int attk;
}
if ((target = which_armor(mdef, W_ARM)) != (struct obj *)0) {
(void)rust_dmg(target, xname(target), hurt, TRUE, mdef);
#ifdef TOURIST
} else if ((target = which_armor(mdef, W_ARMU)) != (struct obj *)0) {
(void)rust_dmg(target, xname(target), hurt, TRUE, mdef);
#endif
}
break;
case 2:
@@ -745,7 +743,6 @@ int thrown; /* HMON_xxx (0 => hand-to-hand, other => ranged) */
}
tmp = 1;
break;
#ifdef TOURIST
case EXPENSIVE_CAMERA:
You("succeed in destroying %s. Congratulations!",
ysimple_name(obj));
@@ -753,7 +750,6 @@ int thrown; /* HMON_xxx (0 => hand-to-hand, other => ranged) */
return(TRUE);
/*NOTREACHED*/
break;
#endif
case CORPSE: /* fixed by polder@cs.vu.nl */
if (touch_petrifies(&mons[obj->corpsenm])) {
tmp = 1;
@@ -1152,9 +1148,7 @@ struct attack *mattk;
/* grabbing attacks the body */
obj = which_armor(mdef, W_ARMC); /* cloak */
if (!obj) obj = which_armor(mdef, W_ARM); /* suit */
#ifdef TOURIST
if (!obj) obj = which_armor(mdef, W_ARMU); /* shirt */
#endif
}
/* if monster's cloak/armor is greased, your grab slips off; this