feat(intro): Add short Intro Logo for The Super Hackers team by xezon · Pull Request #2267 · TheSuperHackers/GeneralsGameCode

xezon · 2026-02-07T13:55:31Z

Merge with Rebase

Relevant friend change: tweak(commandline): Skip intro logo with -quickstart and enable -nologo, -noShellAnim in Release builds #2266

This change has 5 commits:

Move intro related code to new file and class
Simplify the intro state machine to make it easier to modify and extend
Remove the non functional copyright string and simplify the EA logo movie code. This also shortens the effective EA logo duration by 3 to 5 seconds.
Remove the superfluous legal page from intro sequence, which would have lasted 4 seconds after Sizzle video but was practically never visible except if the mem pass would have failed (relevant for 2000 era computers). I think the condition was actually meant to be the inverse...
Add new intro screen for The Super Hacker team

Old Intro Sequence

EA Logo, 3 seconds, non skippable
Black Screen, 3-5 seconds (*1), non skippable
Sizzle Video, skippable
Legal Page, 4 seconds, practically never shown
Shell Map load screen

(*1) I did not measure how long the black screen was. According to code somewhere between 3 to 5 seconds.

New Intro Sequence

EA Logo, 3 seconds, non skippable
Black Screen, 800 milliseconds, non skippable
The Super Hackers Logo, 3 seconds, non skippable
Black Screen, 1 second, non skippable
Sizzle Video, skippable
Shell Map load screen

TODO

Replicate in Generals
Add pull id to commit titles
Verify each commit compiles individually

greptile-apps · 2026-02-07T13:57:27Z

Greptile Summary

This PR replaces the startup intro flow with a reusable state machine. The main changes are:

Adds the shared Intro class and build wiring.
Replaces the legacy logo, wait, and legal-page flow.
Integrates intro updates and rendering in Generals and Zero Hour.
Removes the obsolete m_afterIntro state.

Confidence Score: 5/5

This looks safe to merge.

No blocking issues found in the changed code.

Important Files Changed

Filename	Overview
Core/GameEngine/Source/GameClient/Intro.cpp	Adds the intro state machine, custom logo rendering, waits, and movie transitions.
Generals/Code/GameEngine/Source/GameClient/GameClient.cpp	Owns the Intro instance and switches to the shell after completion.
GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp	Mirrors the Intro lifecycle and shell handoff for Zero Hour.
Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp	Invokes GameClient drawing during the W3D render pass.
GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp	Mirrors the W3D intro drawing integration for Zero Hour.

_{Reviews (17): Last reviewed commit: "feat(intro): Add short Intro Logo for Th..." | Re-trigger Greptile}

greptile-apps

_{9 files reviewed, 4 comments}

_{Edit Code Review Agent Settings | Greptile}

greptile-apps · 2026-02-07T13:57:38Z

Additional Comments (1)

GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp
Intro can block startup

GameClient::update() only shows the shell (TheShell->showShellMap/showShell) after m_intro->isDone(). With the new Intro implementation, if the global flags disable both intro and sizzle (m_playIntro==false and m_playSizzle==false) and m_afterIntro is not pre-set, Intro never reaches Done (see IntroState_Start handling), so the game can get stuck in the intro phase and never show the shell. This previously worked because GameEngine::init() forced m_afterIntro = TRUE when m_playIntro was false.

Fix by making Intro immediately become done when there are no enabled states, or by preserving the old m_afterIntro initialization behavior.

Prompt To Fix With AI

This is a comment left during a code review.
Path: GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp
Line: 514:531

Comment:
**Intro can block startup**

`GameClient::update()` only shows the shell (`TheShell->showShellMap/showShell`) after `m_intro->isDone()`. With the new `Intro` implementation, if the global flags disable both intro and sizzle (`m_playIntro==false` and `m_playSizzle==false`) and `m_afterIntro` is not pre-set, `Intro` never reaches `Done` (see `IntroState_Start` handling), so the game can get stuck in the intro phase and never show the shell. This previously worked because `GameEngine::init()` forced `m_afterIntro = TRUE` when `m_playIntro` was false.

Fix by making `Intro` immediately become done when there are no enabled states, or by preserving the old `m_afterIntro` initialization behavior.

How can I resolve this? If you propose a fix, please make it concise.

greptile-apps

_{4 files reviewed, 2 comments}

_{Edit Code Review Agent Settings | Greptile}

helmutbuhler · 2026-02-07T17:16:49Z

Wouldn't it be more appropriate to show the Superhackers stuff in the credits menu? As is this would imply that the whole game is made by us. I don't think it would be fair to show our names more prominently than the original developers.

xezon · 2026-02-07T17:45:57Z

Wouldn't it be more appropriate to show the Superhackers stuff in the credits menu? As is this would imply that the whole game is made by us. I don't think it would be fair to show our names more prominently than the original developers.

Maybe remove all user names from this Intro and just show the Team name + url?

We can also clarify "Edited by ..."

helmutbuhler · 2026-02-07T17:58:51Z

Wouldn't it be more appropriate to show the Superhackers stuff in the credits menu? As is this would imply that the whole game is made by us. I don't think it would be fair to show our names more prominently than the original developers.

Maybe remove all user names from this Intro and just show the Team name + url?

We can also clarify "Edited by ..."

I wouldn't add anything to the intro. I don't think it's necessary to remind the player every time the game starts who made the patch. Maybe just add a tiny note on the shellmap screen below the gamename "patched by Superhackers" or something like that.

It's nice though that the 3-5 seconds black screen is removed here!

Caball009 · 2026-02-08T06:11:36Z

I didn't even know what the 'black screen' was when I saw this PR, because I have renamed the files for the EA logo and sizzle and I don't see it. This makes the game launch faster, and saves me 5+ seconds every time I launch the game. I strongly dislike changing anything that would unnecessarily increase the launch time for me as developer. I'm ok with it if I can skip it with some command line.

That said, I like the new intro.

LegionnaireG · 2026-02-08T16:21:37Z

I don't think people will understand what it means if the intro screen is this plain. On the intro, maybe add 3 to 5 sentences with the key achievements of TheSuperHackers. Maybe something like:

  We've patched up the game to bring you:
  - Improving game stability
  - Unlocked 60+ FPS for single player
  - Significant reduction in mismatches for multiplayer
  - Higher graphics preset
  - Vulnerability fixes

tintinhamans · 2026-02-08T16:39:44Z

I don't think people will understand what it means if the intro screen is this plain. On the intro, maybe add 3 to 5 sentences with the key achievements of TheSuperHackers. Maybe something like:
  We've patched up the game to bring you:
  - Improving game stability
  - Unlocked 60+ FPS for single player
  - Significant reduction in mismatches for multiplayer
  - Higher graphics preset
  - Vulnerability fixes

I feel like adding too much text won't really be very useful given the fact that it's only shown for 3 seconds.

xezon · 2026-02-08T21:53:08Z

I feel like adding too much text won't really be very useful given the fact that it's only shown for 3 seconds.

I agree with this sentiment.

What we can add is a "Improved by" on top, to clarify that this Author has improved the game. This is very simple and broad.

xezon · 2026-02-09T11:31:16Z

When this is merged I will make a follow up to skip the entire intro sequence with a single ESC press. This will alleviate any waiting pains for impatient users.

xezon · 2026-02-11T19:48:35Z

Improvements applied according to feedbacks:

Removed all individual contributor names (to be shown in Credits Menu instead)
Replaced github url with domain name
Added pretext to clarify that we did not built the game, but improved it

greptile-apps

_{12 files reviewed, 1 comment}

_{Edit Code Review Agent Settings | Greptile}

greptile-apps · 2026-02-11T19:50:19Z

Additional Comments (1)

GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp
Missing cleanup of m_intro in destructor - potential memory leak if GameClient is destroyed before intro completes.

	delete m_intro;
	m_intro = nullptr;

Prompt To Fix With AI

This is a comment left during a code review.
Path: GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp
Line: 119:119

Comment:
Missing cleanup of `m_intro` in destructor - potential memory leak if `GameClient` is destroyed before intro completes.

```suggestion
	delete m_intro;
	m_intro = nullptr;
```

How can I resolve this? If you propose a fix, please make it concise.

greptile-apps

_{12 files reviewed, 1 comment}

_{Edit Code Review Agent Settings | Greptile}

xezon · 2026-02-11T22:48:18Z

Maybe text can be made a bit bigger.

fbraz3 · 2026-02-13T02:51:22Z

A suggestion: the credits screen would display all contributors names.

Something like:

# TheSuperHackers Team

Name 1 - Role
Name 2 - Role
Name 3 - Role
......

# Individual Contributors

Name 4 - 100 commits
Name 5 - 95 commits
.....

# EA games
......
......
......

The git summary command from Git Extras can be used to generate the individual contributors report and add it dinamically on build time.
https://github.com/tj/git-extras/blob/main/Commands.md#git-summary

githubawn · 2026-06-01T21:51:24Z

It looks even stranger now.

xezon · 2026-07-10T20:49:43Z

Rebased on main.

ASCII symbols removed. Normal text readded. Author in UPPER CASE. Web url removed for simplicity.

Looks clean.

bobtista · 2026-07-12T12:30:48Z

+			, sizeY(10)
+			, centerOffsetY(0)
+		{}
+		~DisplayEntity();


DisplayEntity frees displayString in its destructor but has implicit copy ctor/assignment and lives in a std::vector, maybe free the strings in a ~Intro loop instead? I think this would only be an issue if someone appends a second credits screen though

Yes that is not so elegant. It would be solved by making the raw pointer a unique_ptr with c++11. I added a comment for now.

bobtista · 2026-07-12T12:37:03Z

Looks beautiful! I found that it crashes if I exit/alt f4 during our credit screen, left a couple of comments.

bobtista · 2026-07-14T11:16:45Z

Now looks good to me - replicate to Generals then I'd merge

Skyaero42

Looks good

…movie code (#2267)

…e (#2267)

xezon · 2026-07-15T17:55:47Z

Replicated in Generals with conflicts.

$ git diff fa27613249c3cd2747219a76a2d3a6765748dded..50ff3cf9ccf2f7a194d0d9f9b5cb99ce446cb2bb > changes.patch

$ git apply -p2 --directory=Generals --reject --whitespace=fix changes.patch
Checking patch Generals/GameEngine/CMakeLists.txt...
error: Generals/GameEngine/CMakeLists.txt: No such file or directory
Checking patch Generals/GameEngine/Include/GameClient/Intro.h...
Checking patch Generals/GameEngine/Source/GameClient/Intro.cpp...
Checking patch Generals/Code/GameEngine/Include/GameClient/GameClient.h...
Hunk #2 succeeded at 174 (offset -6 lines).
Checking patch Generals/Code/GameEngine/Source/GameClient/GameClient.cpp...
error: while searching for:
#include "Common/ThingFactory.h"
#include "Common/ThingTemplate.h"
#include "Common/Xfer.h"
#include "Common/GameLOD.h"
#include "GameClient/Anim2D.h"
#include "GameClient/CampaignManager.h"
#include "GameClient/ChallengeGenerals.h"

error: patch failed: Generals/Code/GameEngine/Source/GameClient/GameClient.cpp:43
Hunk #3 succeeded at 78 (offset -1 lines).
Hunk #4 succeeded at 107 (offset -1 lines).
Hunk #5 succeeded at 152 (offset -1 lines).
error: while searching for:
                TheSnowManager->setName("TheSnowManager");
        }

#ifdef PERF_TIMERS
        TheGraphDraw = new GraphDraw;
#endif

error: patch failed: Generals/Code/GameEngine/Source/GameClient/GameClient.cpp:434
Hunk #7 succeeded at 501 (offset -22 lines).
Applied patch Generals/GameEngine/Include/GameClient/Intro.h cleanly.
Applied patch Generals/GameEngine/Source/GameClient/Intro.cpp cleanly.
Applied patch Generals/Code/GameEngine/Include/GameClient/GameClient.h cleanly.
Applying patch Generals/Code/GameEngine/Source/GameClient/GameClient.cpp with 2 rejects...
Rejected hunk #1.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Rejected hunk #6.
Hunk #7 applied cleanly.

$ git diff 50ff3cf9ccf2f7a194d0d9f9b5cb99ce446cb2bb..5c361a49c26de30b685336a9d1e9155cee3a41f3 > changes.patch

$ git apply -p2 --directory=Generals --reject --whitespace=fix changes.patch             Checking patch Generals/GameEngine/Include/GameClient/Intro.h...
error: Generals/GameEngine/Include/GameClient/Intro.h: No such file or directory
Checking patch Generals/GameEngine/Source/GameClient/Intro.cpp...
error: Generals/GameEngine/Source/GameClient/Intro.cpp: No such file or directory
Checking patch Generals/Code/GameEngine/Include/Common/GlobalData.h...
Hunk #1 succeeded at 364 (offset -1 lines).
Checking patch Generals/Code/GameEngine/Source/Common/CommandLine.cpp...
Checking patch Generals/Code/GameEngine/Source/Common/GameEngine.cpp...
Hunk #1 succeeded at 578 (offset -167 lines).
Hunk #2 succeeded at 599 (offset -167 lines).
Checking patch Generals/Code/GameEngine/Source/Common/GlobalData.cpp...
Hunk #1 succeeded at 1007 (offset -7 lines).
Checking patch Generals/Code/GameEngine/Source/GameClient/GameClient.cpp...
error: while searching for:
      TheInGameUI->setCameraTrackingDrawable( FALSE );
  }

        if(TheGlobalData->m_playIntro || TheGlobalData->m_afterIntro)
        {
                // redraw all views, update the GUI
                TheDisplay->UPDATE();

error: patch failed: Generals/Code/GameEngine/Source/GameClient/GameClient.cpp:577
Applied patch Generals/Code/GameEngine/Include/Common/GlobalData.h cleanly.
Applied patch Generals/Code/GameEngine/Source/Common/CommandLine.cpp cleanly.
Applied patch Generals/Code/GameEngine/Source/Common/GameEngine.cpp cleanly.
Applied patch Generals/Code/GameEngine/Source/Common/GlobalData.cpp cleanly.
Applying patch Generals/Code/GameEngine/Source/GameClient/GameClient.cpp with 1 reject...
Rejected hunk #1.

$ git diff 722dab9ae7dd621ca1cfe5dbec15b32acee23950..4810e26dbde5af5ef4420dcffdb77b143f0ec874 > changes.patch

$ git apply -p2 --directory=Generals --reject --whitespace=fix changes.patch             Checking patch Generals/GameEngine/Include/GameClient/Intro.h...
error: Generals/GameEngine/Include/GameClient/Intro.h: No such file or directory
Checking patch Generals/GameEngine/Source/GameClient/Intro.cpp...
error: Generals/GameEngine/Source/GameClient/Intro.cpp: No such file or directory
Checking patch Generals/Code/GameEngine/Include/GameClient/GameClient.h...
Hunk #1 succeeded at 88 (offset -4 lines).
Checking patch Generals/Code/GameEngine/Source/GameClient/GameClient.cpp...
Hunk #1 succeeded at 699 (offset -36 lines).
Checking patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp...
Hunk #1 succeeded at 1908 (offset -89 lines).
Applied patch Generals/Code/GameEngine/Include/GameClient/GameClient.h cleanly.
Applied patch Generals/Code/GameEngine/Source/GameClient/GameClient.cpp cleanly.
Applied patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp cleanly.

xezon · 2026-07-15T18:04:34Z

Each individual commit compiles.

…movie code (#2267)

#2267)

Caball009 · 2026-07-15T23:13:08Z

Is the text in the first post up-to-date? Because the image is not. It'd be good if it mentioned that quickstart skips this logo.

xezon added Art Is art related Enhancement Is new feature or request Minor Severity: Minor < Major < Critical < Blocker Gen Relates to Generals ZH Relates to Zero Hour Refactor Edits the code with insignificant behavior changes, is never user facing labels Feb 7, 2026

greptile-apps Bot reviewed Feb 7, 2026

View reviewed changes

Comment thread Core/GameEngine/Source/GameClient/Intro.cpp

Comment thread Core/GameEngine/Include/GameClient/Intro.h

Comment thread Core/GameEngine/Source/GameClient/Intro.cpp

xezon force-pushed the xezon/add-new-intro branch from 999721b to 0f278e6 Compare February 7, 2026 14:15

tintinhamans reviewed Feb 7, 2026

View reviewed changes

Comment thread Core/GameEngine/Source/GameClient/Intro.cpp Outdated

xezon force-pushed the xezon/add-new-intro branch from 0f278e6 to 1a738f7 Compare February 7, 2026 16:19

greptile-apps Bot reviewed Feb 7, 2026

View reviewed changes

Comment thread Core/GameEngine/Include/GameClient/Intro.h

Comment thread Core/GameEngine/Source/GameClient/Intro.cpp

xezon force-pushed the xezon/add-new-intro branch from 1a738f7 to 29b1ce7 Compare February 11, 2026 19:46

greptile-apps Bot reviewed Feb 11, 2026

View reviewed changes

xezon force-pushed the xezon/add-new-intro branch from 29b1ce7 to 9c82551 Compare February 11, 2026 19:55

xezon requested a review from tintinhamans February 11, 2026 19:58

greptile-apps Bot reviewed Feb 11, 2026

View reviewed changes

Comment thread Core/GameEngine/Source/GameClient/Intro.cpp Outdated

xezon requested a review from bobtista May 31, 2026 16:21

xezon force-pushed the xezon/add-new-intro branch from 2679b54 to 7702190 Compare July 10, 2026 20:48

greptile-apps Bot reviewed Jul 10, 2026

View reviewed changes

Comment thread Core/GameEngine/Source/GameClient/Intro.cpp Outdated

xezon force-pushed the xezon/add-new-intro branch from 7702190 to 5e10a09 Compare July 10, 2026 20:52

bobtista reviewed Jul 12, 2026

View reviewed changes

Comment thread GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp Outdated

bobtista reviewed Jul 12, 2026

View reviewed changes

Skyaero42 reviewed Jul 13, 2026

View reviewed changes

xezon force-pushed the xezon/add-new-intro branch from ceb12df to 4810e26 Compare July 13, 2026 17:26

xezon requested review from Skyaero42 and bobtista July 14, 2026 07:23

Skyaero42 approved these changes Jul 14, 2026

View reviewed changes

xezon added 5 commits July 15, 2026 19:52

refactor(intro): Move intro related code to new file and class (#2267)

5a57950

refactor(intro): Simplify the intro state machine in Intro class (#2267)

5b2f382

fix(intro): Remove non functional copyright string and simplify logo …

c01ae4a

…movie code (#2267)

tweak(intro): Remove superfluous legal page window from intro sequenc…

e7635cf

…e (#2267)

feat(intro): Add short Intro Logo for The Super Hackers team (#2267)

c8e1367

xezon force-pushed the xezon/add-new-intro branch from 4810e26 to c8e1367 Compare July 15, 2026 17:54

xezon merged commit 355e006 into TheSuperHackers:main Jul 15, 2026
17 checks passed

xezon added a commit that referenced this pull request Jul 15, 2026

refactor(intro): Move intro related code to new file and class (#2267)

a5f8539

xezon added a commit that referenced this pull request Jul 15, 2026

refactor(intro): Simplify the intro state machine in Intro class (#2267)

49760b5

xezon added a commit that referenced this pull request Jul 15, 2026

fix(intro): Remove non functional copyright string and simplify logo …

90a47ac

…movie code (#2267)

xezon added a commit that referenced this pull request Jul 15, 2026

tweak(intro): Remove superfluous legal page window from intro sequence (

49506a7

#2267)

xezon deleted the xezon/add-new-intro branch July 15, 2026 18:43

Uh oh!

Conversation

xezon commented Feb 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Old Intro Sequence

New Intro Sequence

TODO

Uh oh!

greptile-apps Bot commented Feb 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Greptile Summary

Confidence Score: 5/5

Important Files Changed

Uh oh!

greptile-apps Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

greptile-apps Bot commented Feb 7, 2026

Uh oh!

Uh oh!

greptile-apps Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

helmutbuhler commented Feb 7, 2026

Uh oh!

xezon commented Feb 7, 2026

Uh oh!

helmutbuhler commented Feb 7, 2026

Uh oh!

Caball009 commented Feb 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

LegionnaireG commented Feb 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tintinhamans commented Feb 8, 2026

Uh oh!

xezon commented Feb 8, 2026

Uh oh!

xezon commented Feb 9, 2026

Uh oh!

xezon commented Feb 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

greptile-apps Bot left a comment

Choose a reason for hiding this comment

Uh oh!

greptile-apps Bot commented Feb 11, 2026

Uh oh!

greptile-apps Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

xezon commented Feb 11, 2026

Uh oh!

fbraz3 commented Feb 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

githubawn commented Jun 1, 2026

Uh oh!

xezon commented Jul 10, 2026

Uh oh!

Uh oh!

Uh oh!

bobtista Jul 12, 2026

Choose a reason for hiding this comment

Uh oh!

xezon Jul 12, 2026

Choose a reason for hiding this comment

Uh oh!

bobtista commented Jul 12, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

xezon commented Feb 7, 2026 •

edited

Loading

greptile-apps Bot commented Feb 7, 2026 •

edited

Loading

Caball009 commented Feb 8, 2026 •

edited

Loading

LegionnaireG commented Feb 8, 2026 •

edited

Loading

xezon commented Feb 11, 2026 •

edited

Loading

fbraz3 commented Feb 13, 2026 •

edited

Loading

Caball009 commented Jul 15, 2026 •

edited

Loading