Show all statusline info in #attributes

This commit is contained in:
Pasi Kallinen
2017-01-10 20:45:16 +02:00
parent 131ab0a20e
commit 3ea12fe048
2 changed files with 35 additions and 0 deletions

View File

@@ -364,6 +364,7 @@ some death by the-poison-was-deadly situations left stale non-zero HP shown
on the status line during final disclosure
when sitting at a trap spot: You sit down. You step on a level teleporter.
(likewise for polymorph trap, and similar issue for web)
show all statusline information in #attributes
Fixes to Post-3.6.0 Problems that Were Exposed Via git Repository

View File

@@ -1592,10 +1592,44 @@ characteristics_enlightenment(mode, final)
int mode;
int final;
{
char buf[BUFSZ];
int hp = Upolyd ? u.mh : u.uhp;
int hpmax = Upolyd ? u.mhmax : u.uhpmax;
putstr(en_win, 0, ""); /* separator after background */
putstr(en_win, 0,
final ? "Final Characteristics:" : "Current Characteristics:");
if (hp < 0)
hp = 0;
Sprintf(buf, "%d hit points (max:%d)", hp, hpmax);
you_have(buf, "");
Sprintf(buf, "%d magic power (max:%d)", u.uen, u.uenmax);
you_have(buf, "");
Sprintf(buf, "%d", u.uac);
enl_msg("Your armor class ", "is ", "was ", buf, "");
if (Upolyd) {
Sprintf(buf, "%d hit dice", mons[u.umonnum].mlevel);
} else {
/* flags.showexp does not matter */
/* experience level is already shown in the Background section */
Sprintf(buf, "%-1ld experience point%s",
u.uexp, u.uexp == 1 ? "" : "s");
}
you_have(buf, "");
Sprintf(buf, " You entered the dungeon %ld turn%s ago",
moves, moves == 1 ? "" : "s");
putstr(en_win, 0, buf);
#ifdef SCORE_ON_BOTL
Sprintf(buf, "%ld", botl_score());
enl_msg("Your score ", "is ", "was ", buf, "");
#endif
/* bottom line order */
one_characteristic(mode, final, A_STR); /* strength */
one_characteristic(mode, final, A_DEX); /* dexterity */