Merge branch 'NetHack-3.6'
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* NetHack 3.6 do_name.c $NHDT-Date: 1555627306 2019/04/18 22:41:46 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.145 $ */
|
||||
/* NetHack 3.6 do_name.c $NHDT-Date: 1560161806 2019/06/10 10:16:46 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.147 $ */
|
||||
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
||||
/*-Copyright (c) Pasi Kallinen, 2018. */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
@@ -1924,6 +1924,33 @@ char *outbuf;
|
||||
return outbuf;
|
||||
}
|
||||
|
||||
/* returns mon_nam(mon) relative to other_mon; normal name unless they're
|
||||
the same, in which case the reference is to {him|her|it} self */
|
||||
char *
|
||||
mon_nam_too(mon, other_mon)
|
||||
struct monst *mon, *other_mon;
|
||||
{
|
||||
char *outbuf;
|
||||
|
||||
if (mon != other_mon) {
|
||||
outbuf = mon_nam(mon);
|
||||
} else {
|
||||
outbuf = nextmbuf();
|
||||
switch (pronoun_gender(mon, FALSE)) {
|
||||
case 0:
|
||||
Strcpy(outbuf, "himself");
|
||||
break;
|
||||
case 1:
|
||||
Strcpy(outbuf, "herself");
|
||||
break;
|
||||
default:
|
||||
Strcpy(outbuf, "itself");
|
||||
break;
|
||||
}
|
||||
}
|
||||
return outbuf;
|
||||
}
|
||||
|
||||
/* fake monsters used to be in a hard-coded array, now in a data file */
|
||||
STATIC_OVL char *
|
||||
bogusmon(buf, code)
|
||||
|
||||
Reference in New Issue
Block a user