nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

fix part of #H9397 - hallucinatory mon names

Browse Source 
Fix the issue where a hallucinatory monster name which begins with
a slash is having that stripped off as if it was a gendor and/or
personal-name flag.

The main issue was pronouns ignoring hallucination and this doesn't
attempt to address that.

Also, add new hallucinatory name "leathery-winged avian" which has
been lurking for a while.
This commit is contained in:
PatR
2019-11-21 17:43:55 -08:00
parent 893fa4efa8
commit a62d6145bd
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/do_name.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 do_name.c $NHDT-Date: 1573940540 2019/11/16 21:42:20 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.150 $ */
/* NetHack 3.6 do_name.c $NHDT-Date: 1574387027 2019/11/22 01:43:47 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.151 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2018. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1738,8 +1738,8 @@ boolean called;
Strcat(buf, "saddled ");
has_adjectives = (buf[0] != '\0');
/* Put the actual monster name or type into the buffer now */
/* Be sure to remember whether the buffer starts with a name */
/* Put the actual monster name or type into the buffer now.
Remember whether the buffer starts with a personal name. */
if (do_hallu) {
char rnamecode;
char *rname = rndmonnam(&rnamecode);
@@ -2019,11 +2019,12 @@ STATIC_OVL char *
bogusmon(buf, code)
char *buf, *code;
{
static const char bogon_codes[] = "-_+|="; /* see dat/bonusmon.txt */
char *mname = buf;
get_rnd_text(BOGUSMONFILE, buf, rn2_on_display_rng);
/* strip prefix if present */
if (!letter(*mname)) {
if (index(bogon_codes, *mname)) {
if (code)
*code = *mname;
++mname;