Make TOURIST unconditional.

src/worn.c

@@ -20,9 +20,7 @@ const struct worn {
 	{ W_ARMS, &uarms },
 	{ W_ARMG, &uarmg },
 	{ W_ARMF, &uarmf },
-#ifdef TOURIST
 	{ W_ARMU, &uarmu },
-#endif
 	{ W_RINGL, &uleft },
 	{ W_RINGR, &uright },
 	{ W_WEP, &uwep },
@@ -155,9 +153,7 @@ struct obj *obj;
 	case ARM_GLOVES: res = W_ARMG; break;   /* WORN_GLOVES */
 	case ARM_BOOTS:  res = W_ARMF; break;   /* WORN_BOOTS */
 	case ARM_CLOAK:  res = W_ARMC; break;   /* WORN_CLOAK */
-#ifdef TOURIST
 	case ARM_SHIRT:  res = W_ARMU; break;   /* WORN_SHIRT */
-#endif
 	}
 	break;
     case WEAPON_CLASS:
@@ -438,11 +434,9 @@ boolean creation;
 		return;
 
 	m_dowear_type(mon, W_AMUL, creation, FALSE);
-#ifdef TOURIST
 	/* can't put on shirt if already wearing suit */
 	if (!cantweararm(mon->data) && !(mon->misc_worn_check & W_ARM))
 	    m_dowear_type(mon, W_ARMU, creation, FALSE);
-#endif
 	/* treating small as a special case allows
 	   hobbits, gnomes, and kobolds to wear cloaks */
 	if (!cantweararm(mon->data) || mon->data->msize == MZ_SMALL)
@@ -491,11 +485,9 @@ boolean racialexception;
 			continue;
 		    best = obj;
 		    goto outer_break; /* no such thing as better amulets */
-#ifdef TOURIST
 		case W_ARMU:
 		    if (!is_shirt(obj)) continue;
 		    break;
-#endif
 		case W_ARMC:
 		    if (!is_cloak(obj)) continue;
 		    break;
@@ -542,11 +534,7 @@ outer_break:
 			best->otyp == DUNCE_CAP) && !best->cursed);
 	/* if wearing a cloak, account for the time spent removing
 	   and re-wearing it when putting on a suit or shirt */
-	if ((flag == W_ARM
-#ifdef TOURIST
-	  || flag == W_ARMU
-#endif
-			  ) && (mon->misc_worn_check & W_ARMC))
+	if ((flag == W_ARM || flag == W_ARMU) && (mon->misc_worn_check & W_ARMC))
 	    m_delay += 2;
 	/* when upgrading a piece of armor, account for time spent
 	   taking off current one */
@@ -741,7 +729,6 @@ boolean polyspot;
 		    m_useup(mon, otmp);
 		}
 	    }
-#ifdef TOURIST
 	    if ((otmp = which_armor(mon, W_ARMU)) != 0) {
 		if (vis)
 		    pline("%s shirt rips to shreds!", s_suffix(Monnam(mon)));
@@ -749,7 +736,6 @@ boolean polyspot;
 		    You_hear("a ripping sound.");
 		m_useup(mon, otmp);
 	    }
-#endif
 	} else if (sliparm(mdat)) {
 	    if ((otmp = which_armor(mon, W_ARM)) != 0) {
 		if (vis)
@@ -772,7 +758,6 @@ boolean polyspot;
 		if (polyspot) bypass_obj(otmp);
 		m_lose_armor(mon, otmp);
 	    }
-#ifdef TOURIST
 	    if ((otmp = which_armor(mon, W_ARMU)) != 0) {
 		if (vis) {
 		    if (sliparm(mon->data))
@@ -785,7 +770,6 @@ boolean polyspot;
 		if (polyspot) bypass_obj(otmp);
 		m_lose_armor(mon, otmp);
 	    }
-#endif
 	}
 	if (handless_or_tiny) {
 	    /* [caller needs to handle weapon checks] */