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

variable 'display' causes shadow variable warnings in X11 build

Browse Source 
display.botl      -> disp.botl
display.botlx     -> disp.botlx
display.time_botl -> disp.time_botl
This commit is contained in:
nhmall
2024-01-05 05:58:51 -05:00
parent f8230eff4b
commit 4e19221e55
45 changed files with 249 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/options.c
View File

@@ -5013,7 +5013,7 @@ optfn_boolean(
case opt_showexp:
if (VIA_WINDOWPORT())
status_initialize(REASSESS_ONLY);
display.botl = TRUE;
disp.botl = TRUE;
break;
case opt_fixinv:
case opt_sortpack:
@@ -5069,7 +5069,7 @@ optfn_boolean(
} else if (WINDOWPORT(Qt)) {
/* Qt doesn't support HILITE_STATUS or FLUSH_STATUS so fails
VIA_WINDOWPORT(), but it does support WC2_HITPOINTBAR */
display.botlx = TRUE;
disp.botlx = TRUE;
#endif
}
break;
@@ -8715,7 +8715,7 @@ doset_simple(void)
/*
* I don't think the status window requires updating between
* simplemenu iterations.
if (display.botl || display.botlx) {
if (disp.botl || disp.botlx) {
bot();
}
*/
@@ -8970,7 +8970,7 @@ doset(void) /* changing options via menu by Per Liboriussen */
if (go.opt_need_promptstyle) {
adjust_menu_promptstyle(WIN_INVEN, &iflags.menu_headings);
}
if (display.botl || display.botlx) {
if (disp.botl || disp.botlx) {
bot();
}
return ECMD_OK;