feat(video): add ESC key support to skip campaign Bink videos #1900

bobtista · 2025-11-24T06:42:15Z

-Closes #1896

Adds the ability to skip campaign Bink videos by pressing ESC, matching the behavior of other movies in the game.

Changes:

Added isVideoPlaying() and skipVideo() methods to SinglePlayerLoadScreen
Updated video playback loops to check for skip requests and exit early when ESC is pressed
Updated ESC key handler in WindowXlat to detect campaign videos and trigger skip

Tested with Zero Hour USA Solo Play intro video.

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp

…deo flag

…>stopMovie

Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp

Generals/Code/GameEngine/Include/GameClient/LoadScreen.h

Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

…emove m_skipVideo flag

Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp

Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

xezon

The edits between Generals and Zero Hour need to be properly synced.

Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp

…Bool

…o() return value

…nt.cpp

Generals/Code/GameEngine/Source/GameClient/GameClient.cpp

GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h

…rals GameClient.cpp changes

xezon · 2025-11-28T22:51:59Z

Does not compile :P

…n classes

bobtista · 2025-11-28T23:27:11Z

Does not compile :P

Fixed :)

Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

xezon

I think this review never get done :)

GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h

xezon · 2025-11-30T10:09:33Z

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

+			if( TheKeyboard && TheMessageStream )
+			{
+				TheKeyboard->UPDATE();
+				TheKeyboard->createStreamMessages();


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.

I can take over this change because it takes too many revisions to review.

bobtista added 5 commits November 23, 2025 12:55

Add skip video functionality to SinglePlayerLoadScreen

315e3f8

Add ESC key handler to skip campaign Bink videos

1cc48f2

Add skip video functionality to SinglePlayerLoadScreen

8ddcebc

Add ESC key handler to skip campaign Bink videos

d81a844

feat: Add ESC key support to skip campaign videos

881a208

xezon reviewed Nov 24, 2025

View reviewed changes

bobtista added 4 commits November 24, 2025 11:43

Add virtual functions to LoadScreen base class for video skipping

40f1e0f

Simplify skipVideo() to directly call frameGoto() and remove m_skipVi…

c926884

…deo flag

Replace dynamic_cast with virtual function calls for video skip

c7c8812

Match Generals order: handle load screen video skip after TheDisplay-…

6ae09b0

…>stopMovie

xezon reviewed Nov 24, 2025

View reviewed changes

Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp Outdated Show resolved Hide resolved

Make Generals code match GeneralsMD implementation

79dac14

xezon reviewed Nov 24, 2025

View reviewed changes

Generals/Code/GameEngine/Include/GameClient/LoadScreen.h Outdated Show resolved Hide resolved

Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp Outdated Show resolved Hide resolved

bobtista added 2 commits November 24, 2025 13:20

Make Generals code match GeneralsMD: use pure virtual functions and r…

625242e

…emove m_skipVideo flag

Add missing Keyboard.h include in Generals LoadScreen.cpp

d4f8638

xezon added Enhancement Is new feature or request Minor Severity: Minor < Major < Critical < Blocker Input Gen Relates to Generals ZH Relates to Zero Hour labels Nov 24, 2025

xezon reviewed Nov 24, 2025

View reviewed changes

bobtista added 8 commits November 25, 2025 10:34

Check frameIndex to confirm video playback is active

3b824a2

Format TheMessageStream check with braces for consistency

9ef4b5d

Store getLoadScreen result to avoid duplicate call

e9a0780

Combine TheKeyboard and TheMessageStream conditions

7f7537b

Add comment that campaign videos are skippable

de20cd7

Remove excess blank line in ChallengeLoadScreen

68143c6

Add GameLogic::skipLoadScreen method to prevent direct LoadScreen access

bfe0bea

Combine TheKeyboard and TheMessageStream conditions in GeneralsMD

8548221

bobtista force-pushed the bobtista/campaign-bink-video-skip-esc branch from 1748b1b to 8548221 Compare November 25, 2025 16:31

xezon reviewed Nov 25, 2025

View reviewed changes

Generals/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp Outdated Show resolved Hide resolved

Simplify isVideoPlaying to remove overengineered frameIndex check

150a8b6

xezon reviewed Nov 25, 2025

View reviewed changes

bobtista added 3 commits November 28, 2025 17:30

refactor(video): remove isVideoPlaying() and make skipVideo() return …

0c384c9

…Bool

refactor(video): simplify GameLogic::skipLoadScreen() to use skipVide…

12ab31b

…o() return value

revert: remove accidental whitespace changes from GeneralsMD GameClie…

905430c

…nt.cpp

xezon reviewed Nov 28, 2025

View reviewed changes

Generals/Code/GameEngine/Source/GameClient/GameClient.cpp Show resolved Hide resolved

GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h Outdated Show resolved Hide resolved

fix: sync GeneralsMD LoadScreen base class and remove accidental Gene…

e3b8511

…rals GameClient.cpp changes

fix: add missing skipVideo() implementations to GeneralsMD load scree…

5acba10

…n classes

xezon reviewed Nov 29, 2025

View reviewed changes

Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp Show resolved Hide resolved

bobtista added 3 commits November 29, 2025 08:50

Make Generals WindowXlat formatting match GeneralsMD

884fc9e

Add braces to TheWindowManager conditional in both games

ac01816

Add MessageStream.h include to Generals LoadScreen for consistency

4f24f74

xezon reviewed Nov 29, 2025

View reviewed changes

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp Show resolved Hide resolved

Replicate GeneralsMD changes to Generals using patch method

f4540cf

xezon reviewed Nov 29, 2025

View reviewed changes

GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h Outdated Show resolved Hide resolved

Remove unused getLoadScreen() const method

45edf94

xezon reviewed Nov 30, 2025

View reviewed changes

xezon mentioned this pull request Nov 30, 2025

feat(movie): Implement ESC button mapping to skip Campaign, Challenge and Score videos #1926

Open

2 tasks

feat(video): add ESC key support to skip campaign Bink videos #1900

Are you sure you want to change the base?

feat(video): add ESC key support to skip campaign Bink videos #1900

Uh oh!

Conversation

bobtista commented Nov 24, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xezon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xezon commented Nov 28, 2025

Uh oh!

bobtista commented Nov 28, 2025

Uh oh!

Uh oh!

Uh oh!

xezon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

xezon Nov 30, 2025

Choose a reason for hiding this comment

Uh oh!

xezon Nov 30, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants