Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2
This commit is contained in:
+11
-5
@@ -67,6 +67,7 @@ struct window_procs tty_procs = {
|
||||
#endif
|
||||
#if defined(STATUS_HILITES)
|
||||
| WC2_HILITE_STATUS | WC2_HITPOINTBAR | WC2_FLUSH_STATUS
|
||||
| WC2_RESET_STATUS
|
||||
#endif
|
||||
| WC2_DARKGRAY),
|
||||
tty_init_nhwindows, tty_player_selection, tty_askname, tty_get_nh_event,
|
||||
@@ -3665,6 +3666,9 @@ unsigned long *colormasks;
|
||||
char *fval = (char *) 0;
|
||||
boolean reset_state = NO_RESET;
|
||||
|
||||
if ((fldidx < BL_RESET) || (fldidx >= MAXBLSTATS))
|
||||
return;
|
||||
|
||||
if ((fldidx >= 0 && fldidx < MAXBLSTATS) && !status_activefields[fldidx])
|
||||
return;
|
||||
|
||||
@@ -3726,11 +3730,13 @@ unsigned long *colormasks;
|
||||
case BL_HUNGER:
|
||||
/* The core sends trailing blanks for some fields.
|
||||
Let's suppress the trailing blanks */
|
||||
lastchar = eos(status_vals[fldidx]);
|
||||
lastchar--;
|
||||
while (*lastchar == ' ' && lastchar >= status_vals[fldidx]) {
|
||||
*lastchar-- = '\0';
|
||||
tty_status[NOW][fldidx].lth--;
|
||||
if (tty_status[NOW][fldidx].lth > 0) {
|
||||
lastchar = eos(status_vals[fldidx]);
|
||||
lastchar--;
|
||||
while (lastchar >= status_vals[fldidx] && *lastchar == ' ') {
|
||||
*lastchar-- = '\0';
|
||||
tty_status[NOW][fldidx].lth--;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case BL_TITLE:
|
||||
|
||||
Reference in New Issue
Block a user