From ec8f002d810aa39aab04a104909ebb30f0423ebe Mon Sep 17 00:00:00 2001 From: nhmall Date: Tue, 4 Dec 2018 11:45:41 -0500 Subject: [PATCH] bit-use collision on WC2_TERM_SIZE, WC2_RESET_STATUS --- doc/fixes36.2 | 2 ++ include/winprocs.h | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/fixes36.2 b/doc/fixes36.2 index 53ba866ea..ad513eb17 100644 --- a/doc/fixes36.2 +++ b/doc/fixes36.2 @@ -258,6 +258,8 @@ buliding with EXTRA_SANITY_CHECKS enabled would issue "no monster to remove" changing Sting's description to be "(weapon in hand) (light blue aura)" was too close to feedback when objects become blessed; change it again, to "(weapon in hand, flickering/glimmering/gleaming light blue)" +fix bit-use collision between WC2_TERM_SIZE and WC2_RESET_STATUS in + include/winprocs.h following a recent merge tty: turn off an optimization that is the suspected cause of Windows reported partial status lines following level changes tty: ensure that current status fields are always copied to prior status diff --git a/include/winprocs.h b/include/winprocs.h index 316af5171..ddfef409d 100644 --- a/include/winprocs.h +++ b/include/winprocs.h @@ -216,10 +216,10 @@ extern after updating status window fields */ #define WC2_RESET_STATUS 0x0100L /* 09 call status_update(BL_RESET) to indicate draw everything */ -#define WC2_TERM_SIZE 0x0100L /* 10 support setting terminal size */ -#define WC2_WINDOWBORDERS 0x0200L /* 11 display borders on nh windows */ -#define WC2_PETATTR 0x0400L /* 12 attributes for hilite_pet */ -#define WC2_GUICOLOR 0x0800L /* 13 display colours outside map win */ +#define WC2_TERM_SIZE 0x0200L /* 10 support setting terminal size */ +#define WC2_WINDOWBORDERS 0x0400L /* 11 display borders on nh windows */ +#define WC2_PETATTR 0x0800L /* 12 attributes for hilite_pet */ +#define WC2_GUICOLOR 0x1000L /* 13 display colours outside map win */ /* 19 free bits */ #define ALIGN_LEFT 1