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

cleanup up #vanquished output

Browse Source 
Tidy the output from disclosure of vanquished monsters at end of game
or from #vanquished wizard-mode command.  Instead of

Juiblex
The Wizard of Yendor (twice)
a mastodon
3 purple worms
an erinys
120 gnomes
42 grid bugs

it will line up the monster type names, yielding

    Juiblex
the Wizard of Yendor (twice)
  a mastodon
  3 purple worms
 an erinys
120 gnomes
 42 grid bugs

For short lists, the original looked ok (maybe even better...), but
for long lists at the end of a long game, aligning the names looks
better and is easier to read than left justifying everything.
This commit is contained in:
PatR
2016-04-29 01:48:52 -07:00
parent 8bea47e8b2
commit ff6e62b361
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/end.c
+12 -6
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 end.c $NHDT-Date: 1454571522 2016/02/04 07:38:42 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.114 $ */ /* NetHack 3.6 end.c $NHDT-Date: 1461919723 2016/04/29 08:48:43 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.116 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1438,11 +1438,11 @@ char defquery;
boolean ask; boolean ask;
{ {
register int i, lev; register int i, lev;
int ntypes = 0, max_lev = 0, nkilled; int ntypes = 0, max_lev = 0, pfx, nkilled;
long total_killed = 0L; long total_killed = 0L;
char c; char c;
winid klwin; winid klwin;
char buf[BUFSZ]; char buf[BUFSZ], buftoo[BUFSZ];
/* get totals first */ /* get totals first */
for (i = LOW_PM; i < NUMMONS; i++) { for (i = LOW_PM; i < NUMMONS; i++) {
@@ -1475,7 +1475,7 @@ boolean ask;
&& (nkilled = mvitals[i].died) > 0) { && (nkilled = mvitals[i].died) > 0) {
if ((mons[i].geno & G_UNIQ) && i != PM_HIGH_PRIEST) { if ((mons[i].geno & G_UNIQ) && i != PM_HIGH_PRIEST) {
Sprintf(buf, "%s%s", Sprintf(buf, "%s%s",
!type_is_pname(&mons[i]) ? "The " : "", !type_is_pname(&mons[i]) ? "the " : "",
mons[i].mname); mons[i].mname);
if (nkilled > 1) { if (nkilled > 1) {
switch (nkilled) { switch (nkilled) {
@@ -1496,10 +1496,16 @@ boolean ask;
if (nkilled == 1) if (nkilled == 1)
Strcpy(buf, an(mons[i].mname)); Strcpy(buf, an(mons[i].mname));
else else
Sprintf(buf, "%d %s", nkilled, Sprintf(buf, "%3d %s", nkilled,
makeplural(mons[i].mname)); makeplural(mons[i].mname));
} }
putstr(klwin, 0, buf); /* number of leading spaces to match 3 digit prefix */
pfx = !strncmpi(buf, "the ", 3) ? 0
: !strncmpi(buf, "an ", 3) ? 1
: !strncmpi(buf, "a ", 2) ? 2
: !isdigit(buf[2]) ? 4 : 0;
Sprintf(buftoo, "%*s%s", pfx, "", buf);
putstr(klwin, 0, buftoo);
} }
/* /*
* if (Hallucination) * if (Hallucination)