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

fix build without TTY_PERM_INVENT defined

Browse Source
This commit is contained in:
nhmall
2022-06-27 17:43:47 -04:00
parent 480bb234e7
commit 59cc1d18de
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/invent.c
+18 -3
View File
@@ -5378,7 +5378,10 @@ sync_perminvent(void)
return; return;
if ((!iflags.perm_invent && g.core_invent_state) if ((!iflags.perm_invent && g.core_invent_state)
&& !in_perm_invent_toggled) { #ifdef TTY_PERM_INVENT
&& !in_perm_invent_toggled
#endif
){
/* Odd - but this could be end-of-game disclosure /* Odd - but this could be end-of-game disclosure
* which just sets boolean iflag.perm_invent to * which just sets boolean iflag.perm_invent to
* FALSE without actually doing anything else. * FALSE without actually doing anything else.
@@ -5390,7 +5393,11 @@ sync_perminvent(void)
(void) doredraw(); (void) doredraw();
return; return;
} }
if (!iflags.perm_invent && !in_perm_invent_toggled) if (!iflags.perm_invent
#ifdef TTY_PERM_INVENT
&& !in_perm_invent_toggled
#endif
)
return; return;
/* /*
* The core looks after what content goes into the * The core looks after what content goes into the
@@ -5422,7 +5429,11 @@ sync_perminvent(void)
wport_id = "perm_invent"; wport_id = "perm_invent";
pi_info.fromcore.core_request = 0; pi_info.fromcore.core_request = 0;
if ((iflags.perm_invent && !g.core_invent_state) || in_perm_invent_toggled) { if ((iflags.perm_invent && !g.core_invent_state)
#ifdef TTY_PERM_INVENT
|| in_perm_invent_toggled
#endif
) {
/* Send the wport a request to get the related settings. */ /* Send the wport a request to get the related settings. */
pi_info.fromcore.core_request = request_settings; pi_info.fromcore.core_request = request_settings;
if ((pi = update_invent_slot(g.perm_invent_win, (slot = 0), &pi_info))) { if ((pi = update_invent_slot(g.perm_invent_win, (slot = 0), &pi_info))) {
@@ -5518,7 +5529,9 @@ sync_perminvent(void)
void void
perm_invent_toggled(boolean negated) perm_invent_toggled(boolean negated)
{ {
#ifdef TTY_PERM_INVENT
in_perm_invent_toggled = TRUE; in_perm_invent_toggled = TRUE;
#endif
if (negated) { if (negated) {
if (g.perm_invent_win != WIN_ERR) if (g.perm_invent_win != WIN_ERR)
destroy_nhwindow(g.perm_invent_win), g.perm_invent_win = WIN_ERR; destroy_nhwindow(g.perm_invent_win), g.perm_invent_win = WIN_ERR;
@@ -5526,7 +5539,9 @@ perm_invent_toggled(boolean negated)
} else { } else {
sync_perminvent(); sync_perminvent();
} }
#ifdef TTY_PERM_INVENT
in_perm_invent_toggled = FALSE; in_perm_invent_toggled = FALSE;
#endif
} }
#endif /* CORE_INVENT */ #endif /* CORE_INVENT */