feat(video): add ESC key support to skip campaign Bink videos #1900
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xezon
reviewed
Nov 24, 2025
GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
Outdated
Show resolved
Hide resolved
xezon
reviewed
Nov 24, 2025
Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
Outdated
Show resolved
Hide resolved
xezon
reviewed
Nov 24, 2025
xezon
added
Enhancement
xezon
reviewed
Nov 24, 2025
Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
Outdated
Show resolved
Hide resolved
GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp
Outdated
Show resolved
Hide resolved
bobtista
force-pushed
the
bobtista/campaign-bink-video-skip-esc
branch
from
1748b1b to
8548221
Compare
xezon
reviewed
Nov 25, 2025
xezon
reviewed
Nov 25, 2025
xezon
left a comment
xezon
left a comment
There was a problem hiding this comment.
The edits between Generals and Zero Hour need to be properly synced.
GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
Outdated
Show resolved
Hide resolved
xezon
reviewed
Nov 28, 2025
| { | ||
| TheKeyboard->UPDATE(); | ||
| TheKeyboard->createStreamMessages(); | ||
|
|
| virtual void update( Int percent ); ///< Update the state of the slider bars | ||
| virtual void processProgress(Int playerId, Int percentage) = 0; | ||
| virtual void setProgressRange( Int min, Int max ) = 0; | ||
| virtual Bool skipVideo( void ) { return FALSE; } |
There was a problem hiding this comment.
Is not pure virtual unlike Generals.
Please double check that Generals and GeneralsMD have identical edits.
…rals GameClient.cpp changes
|
Does not compile :P |
Author
Fixed :) |
xezon
reviewed
Nov 29, 2025
|
|
||
| // process event through window system | ||
| if( TheWindowManager ) | ||
| { |
There was a problem hiding this comment.
This edit look different to Generals MD. Please make a pass and eliminate all differences in edits between the games. Both games must be touched identically.
Author
There was a problem hiding this comment.
Ok they both use the braces for the conditional. I found an include that differed, fixed that, and otherwise I just see a newline that's added in one file for formatting where it wouldn't be required in the other file.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
-Closes #1896
Adds the ability to skip campaign Bink videos by pressing ESC, matching the behavior of other movies in the game.
Changes:
isVideoPlaying()andskipVideo()methods toSinglePlayerLoadScreenWindowXlatto detect campaign videos and trigger skipTested with Zero Hour USA Solo Play intro video.