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

couple of interface comments

Browse Source
This commit is contained in:
PatR
2019-05-05 13:38:58 -07:00
parent a8550fc0e7
commit fcd38bdbef
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
win/curses/cursstat.c
View File

@@ -432,7 +432,7 @@ boolean border;
w += (int) strlen(text); w += (int) strlen(text);
/* if preceding field has any trailing spaces, don't add extra; /* if preceding field has any trailing spaces, don't add extra;
(should only apply to prev==title; status_update() handles (should only apply to prev==title; status_update() handles
others that used to have trailing spaces by stripping such */ others that used to have trailing spaces by stripping such) */
if (spacing[fld] > 0 && prev_fld != BL_FLUSH if (spacing[fld] > 0 && prev_fld != BL_FLUSH
&& *(p = status_vals[prev_fld]) && *(eos(p) - 1) == ' ' && *(p = status_vals[prev_fld]) && *(eos(p) - 1) == ' '
&& (prev_fld != BL_TITLE || !iflags.wc2_hitpointbar)) && (prev_fld != BL_TITLE || !iflags.wc2_hitpointbar))

12
win/tty/wintty.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 wintty.c $NHDT-Date: 1555702074 2019/04/19 19:27:54 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.202 $ */ /* NetHack 3.6 wintty.c $NHDT-Date: 1557088734 2019/05/05 20:38:54 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.203 $ */
/* 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. */
@@ -2396,7 +2396,7 @@ winid window;
case NHW_MESSAGE: case NHW_MESSAGE:
if (ttyDisplay->toplin) if (ttyDisplay->toplin)
tty_display_nhwindow(WIN_MESSAGE, TRUE); tty_display_nhwindow(WIN_MESSAGE, TRUE);
/*FALLTHRU*/ /*FALLTHRU*/
case NHW_STATUS: case NHW_STATUS:
case NHW_BASE: case NHW_BASE:
case NHW_MAP: case NHW_MAP:
@@ -3849,7 +3849,7 @@ unsigned long *colormasks;
switch (fldidx) { switch (fldidx) {
case BL_RESET: case BL_RESET:
reset_state = FORCE_RESET; reset_state = FORCE_RESET;
/* FALLTHRU */ /*FALLTHRU*/
case BL_FLUSH: case BL_FLUSH:
if (make_things_fit(reset_state) || truncation_expected) if (make_things_fit(reset_state) || truncation_expected)
render_status(); render_status();
@@ -3931,7 +3931,7 @@ unsigned long *colormasks;
tty_status[NOW][fldidx].lth = 30 + 2; /* '[' and ']' */ tty_status[NOW][fldidx].lth = 30 + 2; /* '[' and ']' */
break; break;
case BL_GOLD: case BL_GOLD:
/* \GXXXXNNNN counts as 1 */ /* \GXXXXNNNN counts as 1 [moot since we use decode_mixed() above] */
if ((p = index(status_vals[fldidx], '\\')) != 0 && p[1] == 'G') if ((p = index(status_vals[fldidx], '\\')) != 0 && p[1] == 'G')
tty_status[NOW][fldidx].lth -= (10 - 1); tty_status[NOW][fldidx].lth -= (10 - 1);
break; break;
@@ -4038,7 +4038,7 @@ int sz[3];
/* On a change to the field location, everything further /* On a change to the field location, everything further
to the right must be updated as well. (Not necessarily to the right must be updated as well. (Not necessarily
everything; it's possible for complementary changes to everything; it's possible for complementary changes across
multiple fields to put stuff further right back in sync.) */ multiple fields to put stuff further right back in sync.) */
if (tty_status[NOW][idx].x + tty_status[NOW][idx].lth if (tty_status[NOW][idx].x + tty_status[NOW][idx].lth
!= tty_status[BEFORE][idx].x + tty_status[BEFORE][idx].lth) != tty_status[BEFORE][idx].x + tty_status[BEFORE][idx].lth)
@@ -4503,7 +4503,7 @@ render_status(VOID_ARGS)
x += tlth; x += tlth;
} }
finalx[row][NOW] = x - 1; finalx[row][NOW] = x - 1;
/* reset .redraw, .dirty, .padright now that they're rendered */ /* reset .redraw and .dirty now that they're rendered */
tty_status[NOW][idx].dirty = FALSE; tty_status[NOW][idx].dirty = FALSE;
tty_status[NOW][idx].redraw = FALSE; tty_status[NOW][idx].redraw = FALSE;
/* /*