Skip to content

[TF2] Fix game_menu conflicting with voice command menu #450

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

Open
wants to merge 1 commit into
base: mapbase-mp-2025
Choose a base branch
from
Open

[TF2] Fix game_menu conflicting with voice command menu #450

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions src/game/client/menu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ class CHudMenu : public CHudElement, public vgui::Panel
bool IsMenuOpen( void );
void SelectMenuItem( int menu_item );

#ifdef MAPBASE
bool IsMenuMapDefined() const { return m_bMapDefinedMenu; }
#endif

private:
virtual void OnThink();
virtual void Paint();
Expand Down
6 changes: 6 additions & 0 deletions src/game/client/voice_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ void OpenVoiceMenu( int index )
if ( !pMenu )
return;

#ifdef MAPBASE
// Don't override map-defined menus
if ( pMenu->IsMenuMapDefined() && pMenu->IsMenuOpen() )
return;
#endif

// if they hit the key again, close the menu
if ( g_ActiveVoiceMenu == index )
{
Expand Down