feat(intro): Add short Intro Logo for The Super Hackers team#2267
feat(intro): Add short Intro Logo for The Super Hackers team#2267xezon wants to merge 8 commits intoTheSuperHackers:mainfrom
Conversation
Greptile Overview
|
| Filename | Overview |
|---|---|
| Core/GameEngine/Include/GameClient/Intro.h | New header for intro sequence class with proper GPL header and state machine design |
| Core/GameEngine/Source/GameClient/Intro.cpp | New implementation of intro sequence with state machine, fade effects, and display entities |
| GeneralsMD/Code/GameEngine/Source/GameClient/GameClient.cpp | Replaced inline intro logic with new Intro class, simplified state management |
| GeneralsMD/Code/GameEngine/Source/GameClient/Display.cpp | Removed playLogoMovie() implementation and copyright display logic |
| GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp | Replaced copyright display string rendering with GameClient::draw() call |
Sequence Diagram
sequenceDiagram
participant GC as GameClient
participant I as Intro
participant D as Display
participant W as W3DDisplay
GC->>I: new Intro()
I->>I: Set allowed state flags based on m_playIntro and m_playSizzle
loop Game Update Loop
GC->>I: update()
alt Movie not playing and wait expired
I->>I: enterNextState()
alt IntroState_EALogoMovie
I->>D: playMovie("EALogoMovie")
else IntroState_TheSuperHackersWait
I->>I: doAsyncWait(800ms)
else IntroState_TheSuperHackers
I->>I: doTheSuperHackers() - setup display entities
I->>I: doAsyncWait(3000ms)
else IntroState_SizzleMovieWait
I->>I: doAsyncWait(1000ms)
else IntroState_SizzleMovie
I->>D: playMovie("Sizzle")
else IntroState_Done
I->>I: doPostIntro() - set exit flags
end
end
alt Intro not done
GC->>D: UPDATE()
D->>W: draw()
W->>GC: DRAW()
GC->>I: draw()
I->>I: drawDisplayEntities() with fade effects
else Intro done
GC->>I: delete intro
GC->>GC: Show shell map
end
end
Additional Comments (1)
Fix by making Prompt To Fix With AIThis 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. |
999721b to
0f278e6
Compare
0f278e6 to
1a738f7
Compare
|
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! |
|
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. |
|
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: |
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. |
|
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. |
…movie code (#2267)
1a738f7 to
29b1ce7
Compare
Additional Comments (1)
Prompt To Fix With AIThis 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. |
29b1ce7 to
9c82551
Compare
|
Maybe text can be made a bit bigger. |
|
A suggestion: the credits screen would display all contributors names. Something like: The |

Merge with Rebase
This change has 5 commits:
Old Intro Sequence
(*1) I did not measure how long the black screen was. According to code somewhere between 3 to 5 seconds.
New Intro Sequence
TODO