pull in the recent unconditionals merge from master

src/do_name.c

@@ -1,4 +1,5 @@
-/* NetHack 3.5	do_name.c	$Date$  $Revision$ */
+/* NetHack 3.5	do_name.c	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$ */
+/* NetHack 3.5	do_name.c	$Date: 2012/01/29 03:00:17 $  $Revision: 1.49 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -328,20 +329,16 @@ do_mname()
 	cy = cc.y;
 
 	if (cx == u.ux && cy == u.uy) {
-#ifdef STEED
 	    if (u.usteed && canspotmon(u.usteed))
 		mtmp = u.usteed;
 	    else {
-#endif
 		pline("This %s creature is called %s and cannot be renamed.",
 		ACURR(A_CHA) > 14 ?
 		(flags.female ? "beautiful" : "handsome") :
 		"ugly",
 		plname);
 		return;
-#ifdef STEED
 	    }
-#endif
 	} else
 	    mtmp = m_at(cx, cy);
 
@@ -677,9 +674,7 @@ boolean called;
 	do_it = !canspotmon(mtmp) && 
 	    article != ARTICLE_YOUR &&
 	    !program_state.gameover &&
-#ifdef STEED
 	    mtmp != u.usteed &&
-#endif
 	    !(u.uswallow && mtmp == u.ustuck) &&
 	    !(suppress & SUPPRESS_IT);
 	do_saddle = !(suppress & SUPPRESS_SADDLE);
@@ -745,11 +740,9 @@ boolean called;
 	    Strcat(strcat(buf, adjective), " ");
 	if (do_invis)
 	    Strcat(buf, "invisible ");
-#ifdef STEED
 	if (do_saddle && (mtmp->misc_worn_check & W_SADDLE) &&
 	    !Blind && !Hallucination)
 	    Strcat(buf, "saddled ");
-#endif
 	if (buf[0] != 0)
 	    has_adjectives = TRUE;
 	else
@@ -897,10 +890,8 @@ struct monst *mtmp;
 
 	prefix = mtmp->mtame ? ARTICLE_YOUR : ARTICLE_THE;
 	suppression_flag = (has_mname(mtmp)
-#ifdef STEED
 			    /* "saddled" is redundant when mounted */
 			    || mtmp == u.usteed
-#endif
 			    ) ? SUPPRESS_SADDLE : 0;
 
 	return x_monnam(mtmp, prefix, (char *)0, suppression_flag, FALSE);
@@ -1066,7 +1057,6 @@ const char *mname;
 	return FALSE;
 }
 
-#ifdef REINCARNATION
 const char *
 roguename() /* Name of a Rogue player */
 {
@@ -1084,7 +1074,6 @@ roguename() /* Name of a Rogue player */
 	return rn2(3) ? (rn2(2) ? "Michael Toy" : "Kenneth Arnold")
 		: "Glenn Wichman";
 }
-#endif /* REINCARNATION */
 
 static NEARDATA const char * const hcolors[] = {
 	"ultraviolet", "infrared", "bluish-orange",