YMonnam(monst)

Replace several upstart(y_monnam(mon)) with new YMonnam(mon) to
produce "Your little dog" and such.

Also change one or two Monnam(mon) to YMonnam(mon) and one pline(...)
to pline_mon(mon, ...).
This commit is contained in:
PatR
2024-07-04 14:27:28 -07:00
parent 0e46439814
commit a33f1edd24
7 changed files with 48 additions and 40 deletions

View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 do_name.c $NHDT-Date: 1708126536 2024/02/16 23:35:36 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.307 $ */
/* NetHack 3.7 do_name.c $NHDT-Date: 1720128164 2024/07/04 21:22:44 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.319 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2018. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1061,7 +1061,7 @@ Monnam(struct monst *mtmp)
char *bp = mon_nam(mtmp);
*bp = highc(*bp);
return bp;
return bp;
}
char *
@@ -1070,7 +1070,7 @@ noit_Monnam(struct monst *mtmp)
char *bp = noit_mon_nam(mtmp);
*bp = highc(*bp);
return bp;
return bp;
}
char *
@@ -1079,7 +1079,7 @@ Some_Monnam(struct monst *mtmp)
char *bp = some_mon_nam(mtmp);
*bp = highc(*bp);
return bp;
return bp;
}
/* return "a dog" rather than "Fido", honoring hallucination and visibility */
@@ -1113,6 +1113,16 @@ y_monnam(struct monst *mtmp)
return x_monnam(mtmp, prefix, (char *) 0, suppression_flag, FALSE);
}
/* y_monnam() for start of sentence */
char *
YMonnam(struct monst *mtmp)
{
char *bp = y_monnam(mtmp);
*bp = highc(*bp);
return bp;
}
char *
Adjmonnam(struct monst *mtmp, const char *adj)
{
@@ -1120,7 +1130,7 @@ Adjmonnam(struct monst *mtmp, const char *adj)
has_mgivenname(mtmp) ? SUPPRESS_SADDLE : 0, FALSE);
*bp = highc(*bp);
return bp;
return bp;
}
char *
@@ -1136,7 +1146,7 @@ Amonnam(struct monst *mtmp)
char *bp = a_monnam(mtmp);
*bp = highc(*bp);
return bp;
return bp;
}
/* used for monster ID by the '/', ';', and 'C' commands to block remote