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

minimal_xname() fix (trunk only)

Browse Source 
ansimpleoname() and siblings always reported statue and figurine
type to be "of a giant ant" because the corpsenm field was left as 0.
Explicitly set it to -1 in the minimal object and teach xname() to leave
off the monster type in that situation, yielding just "a statue" or "a
figurine".  [It's tempting to classify this as an xname() bug since other
object types which use corpsenm do so in doname().]  No fixes entry; this
is post-3.4.3 code.
This commit is contained in:
nethack.rankin
2007-07-17 13:35:54 +00:00
parent f17e97bac6
commit 65905e6ce9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/objnam.c
+3 -2
View File
@@ -308,7 +308,7 @@ register struct obj *obj;
Strcat(buf, dn ? dn : actualn); Strcat(buf, dn ? dn : actualn);
/* If we use an() here we'd have to remember never to use */ /* If we use an() here we'd have to remember never to use */
/* it whenever calling doname() or xname(). */ /* it whenever calling doname() or xname(). */
if (typ == FIGURINE) if (typ == FIGURINE && omndx != NON_PM)
Sprintf(eos(buf), " of a%s %s", Sprintf(eos(buf), " of a%s %s",
index(vowels, *mons[omndx].mname) ? "n" : "", index(vowels, *mons[omndx].mname) ? "n" : "",
mons[omndx].mname); mons[omndx].mname);
@@ -381,7 +381,7 @@ register struct obj *obj;
Strcpy(buf, actualn); Strcpy(buf, actualn);
break; break;
case ROCK_CLASS: case ROCK_CLASS:
if (typ == STATUE) if (typ == STATUE && omndx != NON_PM)
Sprintf(buf, "%s%s of %s%s", Sprintf(buf, "%s%s of %s%s",
(Role_if(PM_ARCHEOLOGIST) && (Role_if(PM_ARCHEOLOGIST) &&
(obj->spe & STATUE_HISTORIC)) ? "historic " : "", (obj->spe & STATUE_HISTORIC)) ? "historic " : "",
@@ -530,6 +530,7 @@ 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 */
bufp = distant_name(&bareobj, xname); /* xname(&bareobj) */ bufp = distant_name(&bareobj, xname); /* xname(&bareobj) */
if (!strncmp(bufp, "uncursed ", 9)) bufp += 9; /* Role_if(PM_PRIEST) */ if (!strncmp(bufp, "uncursed ", 9)) bufp += 9; /* Role_if(PM_PRIEST) */