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

tty status condition: Cf, Hl, Rd

Browse Source 
While the fuzzer was running, amidst the continual screen updating I
caught a glimpse of "Cn" and was puzzled about how the hero became
cancelled.  I quickly realized it actually meant confused, but I
think "Cf" is a better abbreviation for that.  I've also changed "Ha"
to "Hl" for hallucination and "Ri" to "Rd" for riding.  The rest is
formatting.
This commit is contained in:
PatR
2018-12-14 18:51:07 -08:00
parent aa5a85f4da
commit 436f8a9fde
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/tty/wintty.c
+6 -7
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 wintty.c $NHDT-Date: 1526909614 2018/05/21 13:33:34 $ $NHDT-Branch: NetHack-3.6.2 $:$NHDT-Revision: 1.167 $ */ /* NetHack 3.6 wintty.c $NHDT-Date: 1544842261 2018/12/15 02:51:01 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.188 $ */
/* Copyright (c) David Cohrs, 1991 */ /* Copyright (c) David Cohrs, 1991 */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -3512,8 +3512,7 @@ static struct tty_status_fields
static int hpbar_percent, hpbar_color; static int hpbar_percent, hpbar_color;
static struct condition_t { static struct condition_t {
long mask; long mask;
const char *text[3]; /* 3: potential display values, progressively const char *text[3]; /* 3: potential display vals, progressively shorter */
* smaller */
} conditions[] = { } conditions[] = {
/* The sequence order of these matters */ /* The sequence order of these matters */
{ BL_MASK_STONE, { "Stone", "Ston", "Sto" } }, { BL_MASK_STONE, { "Stone", "Ston", "Sto" } },
@@ -3524,11 +3523,11 @@ static struct condition_t {
{ BL_MASK_BLIND, { "Blind", "Blnd", "Bl" } }, { BL_MASK_BLIND, { "Blind", "Blnd", "Bl" } },
{ BL_MASK_DEAF, { "Deaf", "Def", "Df" } }, { BL_MASK_DEAF, { "Deaf", "Def", "Df" } },
{ BL_MASK_STUN, { "Stun", "Stun", "St" } }, { BL_MASK_STUN, { "Stun", "Stun", "St" } },
{ BL_MASK_CONF, {"Conf", "Cnf", "Cn"}}, { BL_MASK_CONF, { "Conf", "Cnf", "Cf" } },
{ BL_MASK_HALLU, {"Hallu", "Hal", "Ha"}}, { BL_MASK_HALLU, { "Hallu", "Hal", "Hl" } },
{ BL_MASK_LEV, { "Lev", "Lev", "Lv" } }, { BL_MASK_LEV, { "Lev", "Lev", "Lv" } },
{ BL_MASK_FLY, { "Fly", "Fly", "Fl" } }, { BL_MASK_FLY, { "Fly", "Fly", "Fl" } },
{ BL_MASK_RIDE, {"Ride", "Rid", "Ri"}}, { BL_MASK_RIDE, { "Ride", "Rid", "Rd" } },
}; };
static const char *encvals[3][6] = { static const char *encvals[3][6] = {
{ "", "Burdened", "Stressed", "Strained", "Overtaxed", "Overloaded" }, { "", "Burdened", "Stressed", "Strained", "Overtaxed", "Overloaded" },
@@ -3536,7 +3535,7 @@ static const char *encvals[3][6] = {
{ "", "Brd", "Strs", "Strn", "Ovtx", "Ovld" } { "", "Brd", "Strs", "Strn", "Ovtx", "Ovld" }
}; };
#define MAX_PER_ROW 15 #define MAX_PER_ROW 15
static enum statusfields fieldorder[2][MAX_PER_ROW] = { /* 2: two status lines */ static enum statusfields fieldorder[2][MAX_PER_ROW] = { /* 2: 2 status lines */
{ BL_TITLE, BL_STR, BL_DX, BL_CO, BL_IN, BL_WI, BL_CH, BL_ALIGN, { BL_TITLE, BL_STR, BL_DX, BL_CO, BL_IN, BL_WI, BL_CH, BL_ALIGN,
BL_SCORE, BL_FLUSH, BL_FLUSH, BL_FLUSH, BL_FLUSH, BL_FLUSH, BL_SCORE, BL_FLUSH, BL_FLUSH, BL_FLUSH, BL_FLUSH, BL_FLUSH,
BL_FLUSH }, BL_FLUSH },