Make TOURIST unconditional.

win/Qt/qt_win.cpp

@@ -3498,13 +3498,8 @@ void NetHackQtInvUsageWindow::paintEvent(QPaintEvent*)
     drawWorn(painter,uarms,0,1); // Shield
     drawWorn(painter,uarmg,0,2); // Gloves - repeated
     drawWorn(painter,uarmg,2,2); // Gloves - repeated
-#ifdef TOURIST
     drawWorn(painter,uarmf,1,5); // Shoes (feet)
     drawWorn(painter,uarmu,1,4); // Undershirt
-#else
-    drawWorn(painter,0    ,1,5,FALSE);
-    drawWorn(painter,uarmf,1,4); // Shoes (feet)
-#endif
     drawWorn(painter,uleft,0,3); // RingL
     drawWorn(painter,uright,2,3); // RingR
 

win/gnome/gnworn.c

@@ -14,7 +14,6 @@
 #define WORN_WIDTH	3
 #define WORN_HEIGHT	6
 
-#ifdef TOURIST
 #define WORN_OBJECT_LIST /* struct obj *[WORN_HEIGHT][WORN_WIDTH] = */ { \
     { uquiver,	uarmh,	    u.twoweap ? NULL : uswapwep }, \
     { u.twoweap ? uswapwep : NULL,  ublindf,	uwep	    }, \
@@ -23,16 +22,6 @@
     { uarmu,	uarm,	    uskin	}, \
     { uball,	uarmf,	    uchain	} \
 }
-#else
-#define WORN_OBJECT_LIST /* struct obj *[WORN_HEIGHT][WORN_WIDTH] = */ { \
-    { uquiver,	uarmh,	    u.twoweap ? NULL : uswapwep }, \
-    { u.twoweap ? uswapwep : NULL,	ublindf,    uwep    }, \
-    { uleft,	uamul,	    uright	}, \
-    { uarms,	uarmc,	    uarmg	}, \
-    { NULL,	uarm,	    uskin	}, \
-    { uball,	uarmf,	    uchain	} \
-}
-#endif
 
 static GtkWidget *worn_contents[WORN_HEIGHT][WORN_WIDTH];
 static struct obj *last_worn_objects[WORN_HEIGHT][WORN_WIDTH];

win/share/tilemap.c

@@ -48,31 +48,16 @@ struct conditionals {
 #endif
 #ifndef MAIL
 	{ MON_GLYPH, PM_FAMINE, "mail daemon" },
-#endif
-#ifndef TOURIST
-	{ MON_GLYPH, PM_SAMURAI, "tourist" },
 #endif
 	/* commented out in monst.c at present */
 	{ MON_GLYPH, PM_SHAMAN_KARNOV, "Earendil" },
 	{ MON_GLYPH, PM_SHAMAN_KARNOV, "Elwing" },
-#ifndef TOURIST
-	{ MON_GLYPH, PM_LORD_SATO, "Twoflower" },
-#endif
 	/* commented out in monst.c at present */
 	{ MON_GLYPH, PM_CHROMATIC_DRAGON, "Goblin King" },
 	{ MON_GLYPH, PM_NEANDERTHAL, "High-elf" },
-#ifndef TOURIST
-	{ MON_GLYPH, PM_ROSHI, "guide" },
-#endif
 	/* objects commented out in objects.c at present */
 	{ OBJ_GLYPH, SILVER_DRAGON_SCALE_MAIL, "shimmering dragon scale mail" },
 	{ OBJ_GLYPH, SILVER_DRAGON_SCALES, "shimmering dragon scales" },
-#ifndef TOURIST
-	{ OBJ_GLYPH, LEATHER_JACKET, "Hawaiian shirt" },
-	{ OBJ_GLYPH, LEATHER_JACKET, "T-shirt" },
-	{ OBJ_GLYPH, LOCK_PICK, "credit card" },
-	{ OBJ_GLYPH, MAGIC_LAMP, "expensive camera" },
-#endif
 	/* allow slime mold to look like slice of pizza, since we
 	 * don't know what a slime mold should look like when renamed anyway
 	 */