Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2

This commit is contained in:
nhmall
2019-04-29 07:49:58 -04:00
2 changed files with 7 additions and 3 deletions

View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.310 $ $NHDT-Date: 1556201496 2019/04/25 14:11:36 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.311 $ $NHDT-Date: 1556497911 2019/04/29 00:31:51 $
This fixes36.2 file is here to capture information about updates in the 3.6.x This fixes36.2 file is here to capture information about updates in the 3.6.x
lineage following the release of 3.6.1 in April 2018. Please note, however, lineage following the release of 3.6.1 in April 2018. Please note, however,
@@ -514,6 +514,9 @@ tty: when clipping was used to show a subset of the map on a small display,
would ask the core to generate a new view of the map rather than use would ask the core to generate a new view of the map rather than use
whatever was currently shown, bringing back suppressed monsters/ whatever was currently shown, bringing back suppressed monsters/
objects/traps for #terrain and new hallucinatory monsters for farlook objects/traps for #terrain and new hallucinatory monsters for farlook
Qt5, perhaps others: avoid "status 'reassess' before init" panic near start
of new game (triggered from set_uasmon() if core was built with
STATUS_HILITES enabled but current interface doesn't support that)
X11: its use of genl_status_update exposed a negative index use that could X11: its use of genl_status_update exposed a negative index use that could
lead to a segfault lead to a segfault
X11: rollback disabling of keystroke input for PICK_NONE menus (for scrolling) X11: rollback disabling of keystroke input for PICK_NONE menus (for scrolling)

View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 polyself.c $NHDT-Date: 1556201497 2019/04/25 14:11:37 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.131 $ */ /* NetHack 3.6 polyself.c $NHDT-Date: 1556497911 2019/04/29 00:31:51 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.132 $ */
/* Copyright (C) 1987, 1988, 1989 by Ken Arromdee */ /* Copyright (C) 1987, 1988, 1989 by Ken Arromdee */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -101,7 +101,8 @@ set_uasmon()
polysense(); polysense();
#ifdef STATUS_HILITES #ifdef STATUS_HILITES
status_initialize(REASSESS_ONLY); if (VIA_WINDOWPORT())
status_initialize(REASSESS_ONLY);
#endif #endif
} }