feat(video): add ESC key support to skip campaign Bink videos#1900
Closed
bobtista wants to merge 31 commits intoTheSuperHackers:mainfrom
Closed
feat(video): add ESC key support to skip campaign Bink videos#1900bobtista wants to merge 31 commits intoTheSuperHackers:mainfrom
bobtista wants to merge 31 commits intoTheSuperHackers:mainfrom
Conversation
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
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
1748b1b to
8548221
Compare
xezon
reviewed
Nov 25, 2025
xezon
reviewed
Nov 25, 2025
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
…rals GameClient.cpp changes
|
Does not compile :P |
Author
Fixed :) |
xezon
reviewed
Nov 29, 2025
xezon
reviewed
Nov 29, 2025
xezon
reviewed
Nov 30, 2025
| if( TheKeyboard && TheMessageStream ) | ||
| { | ||
| TheKeyboard->UPDATE(); | ||
| TheKeyboard->createStreamMessages(); |
There was a problem hiding this comment.
After taking a look at this function, I think this logic can be greatly simplified by cutting the Message middle man and do the key press detection right in this update loop, which then eliminates touching a whole bunch of files.
There was a problem hiding this comment.
I can take over this change because it takes too many revisions to review.
2 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.