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

\#wizborn fix

Browse Source 
The #wizborn command shows 'E' for an extinct species and 'G' for a
genocided one, but if a species first becomes extinct and then later
gets genocided, instead of showing both flags it stopped showing
either.  I was going to add a second flag column and show 'E' and 'G'
separately but decided to stick with one column and display 'X' for
the unlikely 'both extinct and genocided' case.
This commit is contained in:
PatR
2022-10-25 13:58:26 -07:00
parent 7f94d04013
commit 1ccad11fab
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/insight.c
View File

@@ -2635,11 +2635,13 @@ doborn(void)
putstr(datawin, 0, "died born");
for (i = LOW_PM; i < NUMMONS; i++)
if (g.mvitals[i].born || g.mvitals[i].died
|| (g.mvitals[i].mvflags & G_GONE)) {
|| (g.mvitals[i].mvflags & G_GONE) != 0) {
Sprintf(buf, fmt,
g.mvitals[i].died, g.mvitals[i].born,
((g.mvitals[i].mvflags & G_GONE) == G_EXTINCT) ? 'E' :
((g.mvitals[i].mvflags & G_GONE) == G_GENOD) ? 'G' : ' ',
((g.mvitals[i].mvflags & G_GONE) == G_EXTINCT) ? 'E'
: ((g.mvitals[i].mvflags & G_GONE) == G_GENOD) ? 'G'
: ((g.mvitals[i].mvflags & G_GONE) != 0) ? 'X'
: ' ',
mons[i].pmnames[NEUTRAL]);
putstr(datawin, 0, buf);
nborn += g.mvitals[i].born;
@@ -2676,8 +2678,10 @@ list_vanquished(char defquery, boolean ask)
boolean dumping; /* for DUMPLOG; doesn't need to be conditional */
dumping = (defquery == 'd');
if (dumping)
if (dumping) {
defquery = 'y';
ask = FALSE; /* redundant; caller passes False with defquery=='d' */
}
/* get totals first */
ntypes = 0;