Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clear active thermo when prematurely exiting out of the menu #2111

Merged
merged 1 commit into from
Dec 31, 2024
Merged

clear active thermo when prematurely exiting out of the menu #2111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/mn_setup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4212,6 +4212,8 @@ static boolean NextPage(int inc)
return true;
}

static setup_menu_t *active_thermo = NULL;

boolean MN_SetupResponder(menu_action_t action, int ch)
{
// phares 3/26/98 - 4/11/98:
Expand Down Expand Up @@ -4460,6 +4462,7 @@ boolean MN_SetupResponder(menu_action_t action, int ch)
set_weapon_active = false;
default_verify = false; // phares 4/19/98
print_warning_about_changes = false; // [FG] reset
active_thermo = NULL;
M_StartSound(sfx_swtchx);
return true;
}
Expand Down Expand Up @@ -4526,8 +4529,6 @@ boolean MN_SetupMouseResponder(int x, int y)
return true;
}

static setup_menu_t *active_thermo = NULL;

if (M_InputDeactivated(input_menu_enter) && active_thermo)
{
int flags = active_thermo->m_flags;
Expand Down