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

another "next boulder" bit

Browse Source 
simpleonames() calls minimal_xname() which was setting up a dummy
object and making its corpsenm field be NON_PM.  For a boulder, that
yielded "next boulder" instead of the intended "boulder".
This commit is contained in:
PatR
2021-10-18 12:10:38 -07:00
parent 7a3da50156
commit 1d334b861f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/objnam.c
+4 -2
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 objnam.c $NHDT-Date: 1633802071 2021/10/09 17:54:31 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.335 $ */ /* NetHack 3.7 objnam.c $NHDT-Date: 1634584224 2021/10/18 19:10:24 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.336 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2011. */ /*-Copyright (c) Robert Patrick Rankin, 2011. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -859,7 +859,9 @@ minimal_xname(struct obj *obj)
/* default is "on" for types which don't use it */ /* default is "on" for types which don't use it */
: !objects[otyp].oc_uses_known; : !objects[otyp].oc_uses_known;
bareobj.quan = 1L; /* don't want plural */ bareobj.quan = 1L; /* don't want plural */
bareobj.corpsenm = NON_PM; /* suppress statue and figurine details */ /* for a boulder, leave corpsenm as 0; non-zero produces "next boulder" */
if (otyp != BOULDER)
bareobj.corpsenm = NON_PM; /* suppress statue and figurine details */
/* but suppressing fruit details leads to "bad fruit #0" /* but suppressing fruit details leads to "bad fruit #0"
[perhaps we should force "slime mold" rather than use xname?] */ [perhaps we should force "slime mold" rather than use xname?] */
if (obj->otyp == SLIME_MOLD) if (obj->otyp == SLIME_MOLD)