Skip to content

Fix key states and sync with upstream #20

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

Merged
a1batross merged 4 commits into from
Jun 9, 2026
Merged

Fix key states and sync with upstream #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0c8b85
LoadGame: localize known save types (quick/autosave)
Vladislav4KZ Jun 7, 2026
c66916f
Merge remote-tracking branch 'upstream/master' into cs16-client
Vladislav4KZ Jun 9, 2026
c5ba2ef
BaseMenu: prevent function calls in UI_CloseClientMenu when the menu …
Vladislav4KZ Jun 9, 2026
ee632a6
udll_int: clear key states when opening the menu to prevent stuck input
Vladislav4KZ Jun 9, 2026
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
3 changes: 3 additions & 0 deletions BaseMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,9 @@ void UI_CloseMenu( void )

void UI_CloseClientMenu( void )
{
if( !uiStatic.client.IsActive() )
return;

uiStatic.client.Clean();
EngFuncs::KEY_ClearStates();
EngFuncs::KEY_SetDest( KEY_GAME );
Expand Down
10 changes: 9 additions & 1 deletion menus/LoadGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,15 @@ void CMenuSavesListModel::Update( void )
Q_strncpy( s, title, sizeof( s ));

if( type )
snprintf( save.comment, sizeof( save.comment ), "[%.16s]%s", type, L( s ));
{
// Localize known save-type identifiers (quick/autosave). Otherwise, fall back to original behavior.
if( !stricmp( type, "quick" ))
snprintf( save.comment, sizeof( save.comment ), "%s%s", L( "GameUI_QuickSave" ), L( s ));
else if( !stricmp( type, "autosave" ))
snprintf( save.comment, sizeof( save.comment ), "%s%s", L( "GameUI_AutoSave" ), L( s ));
else
snprintf( save.comment, sizeof( save.comment ), "[%.16s]%s", type, L( s ));
}
else Q_strncpy( save.comment, L( s ), sizeof( save.comment ));
}
else
Expand Down
4 changes: 4 additions & 0 deletions udll_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ static class CGameMenuExports : public IGameMenuExports

void ShowVGUIMenu( int menuType, int param1, int param2 ) override
{
// Clear button states to prevent stuck input
// when opening the menu while a key is held down
EngFuncs::KEY_ClearStates();

switch( menuType )
{
case MENU_TEAM: UI_JoinGame_Show( param1, param2 ); break;
Expand Down