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

xprname fix

Browse Source 
The GOLDOBJ fix I posted back on 1/3 caused "Ix" to access a null pointer
(obj) while generating the total line.  This patch fixes the bug I added to
xprname.
This commit is contained in:
cohrs
2002-01-20 22:25:16 +00:00
parent 7a634884b4
commit 202a383444
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/invent.c
View File

@@ -1428,9 +1428,13 @@ long quan; /* if non-0, print this quantity, not obj->quan */
static char li[BUFSZ]; static char li[BUFSZ];
#endif #endif
boolean use_invlet = flags.invlet_constant && let != CONTAINED_SYM; boolean use_invlet = flags.invlet_constant && let != CONTAINED_SYM;
long savequan = obj->quan; long savequan = 0;
if (quan && obj) {
savequan = obj->quan;
obj->quan = quan;
}
if (quan) obj->quan = quan;
/* /*
* If let is: * If let is:
* * Then obj == null and we are printing a total amount. * * Then obj == null and we are printing a total amount.
@@ -1442,7 +1446,7 @@ long quan; /* if non-0, print this quantity, not obj->quan */
(dot && use_invlet ? obj->invlet : let), (dot && use_invlet ? obj->invlet : let),
(txt ? txt : doname(obj)), cost, plur(cost)); (txt ? txt : doname(obj)), cost, plur(cost));
#ifndef GOLDOBJ #ifndef GOLDOBJ
} else if (obj->oclass == GOLD_CLASS) { } else if (obj && obj->oclass == GOLD_CLASS) {
Sprintf(li, "%ld gold piece%s%s", obj->quan, plur(obj->quan), Sprintf(li, "%ld gold piece%s%s", obj->quan, plur(obj->quan),
(dot ? "." : "")); (dot ? "." : ""));
#endif #endif
@@ -1452,7 +1456,7 @@ long quan; /* if non-0, print this quantity, not obj->quan */
(use_invlet ? obj->invlet : let), (use_invlet ? obj->invlet : let),
(txt ? txt : doname(obj)), (dot ? "." : "")); (txt ? txt : doname(obj)), (dot ? "." : ""));
} }
if (quan) obj->quan = savequan; if (savequan) obj->quan = savequan;
return li; return li;
} }