Skip to content

unify(shell): Move Shell to Core - #3070

Open
Jaredl-Dev wants to merge 2 commits into
TheSuperHackers:mainfrom
Jaredl-Dev:unify/shell
Open

unify(shell): Move Shell to Core#3070
Jaredl-Dev wants to merge 2 commits into
TheSuperHackers:mainfrom
Jaredl-Dev:unify/shell

Conversation

@Jaredl-Dev

@Jaredl-Dev Jaredl-Dev commented Aug 7, 2026

Copy link
Copy Markdown

Requires #3075 for successful VC6 and Win32 profile builds.

This moves the shared Shell files into Core:

  • Shell.h
  • Shell.cpp
  • ShellMenuScheme.h
  • ShellMenuScheme.cpp

Generals and Zero Hour differ only by product-name comments and the RTS_PROFILE_LEGACY initialization profiling hook in Shell.cpp.

Generals gets:

  • Stops the legacy init profiling range before opening the main menu, matching Zero Hour.

Verification

  • Verified all four Core files exactly match the Zero Hour source.
  • Win32 Release build succeeds.
  • VC6 Release build succeeds.

Jaredl-Dev added a commit to Jaredl-Dev/GeneralsGameCode that referenced this pull request Aug 7, 2026
Jaredl-Dev added a commit to Jaredl-Dev/GeneralsGameCode that referenced this pull request Aug 7, 2026
@Jaredl-Dev

Copy link
Copy Markdown
Author

Generals now inherits Profile::StopRange("init"), but unlike Zero Hour, it never calls StartRange("init"). Should it be added to Generals’ WinMain.cpp?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant