Skip to content

bugfix(input): Block all button presses except ESC during scripted camera scenes #2621

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
xezon merged 1 commit into from
Apr 18, 2026
+6 −4
Merged

bugfix(input): Block all button presses except ESC during scripted camera scenes #2621

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
5 changes: 3 additions & 2 deletions Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,10 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
returnCode = WIN_INPUT_USED;
}

// TheSuperHackers @bugfix If the input is disabled, then only allow the ESC button to get through.
// Otherwise it would be possible to call user camera actions during scripted camera scenes.
if(returnCode != WIN_INPUT_USED
&& (key == KEY_ESC)
&& (BitIsSet( state, KEY_STATE_UP ))
&& (key != KEY_ESC)
&& (TheInGameUI && (TheInGameUI->getInputEnabled() == FALSE)) )
{
returnCode = WIN_INPUT_USED;
Expand Down
5 changes: 3 additions & 2 deletions GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,10 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
returnCode = WIN_INPUT_USED;
}

// TheSuperHackers @bugfix If the input is disabled, then only allow the ESC button to get through.
// Otherwise it would be possible to call user camera actions during scripted camera scenes.
if(returnCode != WIN_INPUT_USED
&& (key == KEY_ESC)
&& (BitIsSet( state, KEY_STATE_UP ))
&& (key != KEY_ESC)
&& (TheInGameUI && (TheInGameUI->getInputEnabled() == FALSE)) )
{
returnCode = WIN_INPUT_USED;
Expand Down
Loading