Make TOURIST unconditional.

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

View File

@@ -72,7 +72,6 @@ doread()
if (!Blind) u.uconduct.literate++;
useup(scroll);
return(1);
#ifdef TOURIST
} else if (scroll->otyp == T_SHIRT) {
static const char *shirt_msgs[] = { /* Scott Bigham */
"I explored the Dungeons of Doom and all I got was this lousy T-shirt!",
@@ -117,7 +116,6 @@ doread()
scroll->o_id ^ (unsigned)ubirthday);
pline("\"%s\"", buf);
return 1;
#endif /* TOURIST */
} else if (scroll->oclass != SCROLL_CLASS
&& scroll->oclass != SPBOOK_CLASS) {
pline(silly_thing_to, "read");
@@ -364,9 +362,7 @@ int curse_bless;
break;
case MAGIC_MARKER:
case TINNING_KIT:
#ifdef TOURIST
case EXPENSIVE_CAMERA:
#endif
if (is_cursed) stripspe(obj);
else if (rechrg && obj->otyp == MAGIC_MARKER) { /* previously recharged */
obj->recharged = 1; /* override increment done above */