Skip to content

unify(gui): Move EstablishConnectionsMenu to Core - #3069

Merged
xezon merged 1 commit into
TheSuperHackers:mainfrom
Jaredl-Dev:unify/establishconnectionsmenu
Aug 8, 2026
Merged

unify(gui): Move EstablishConnectionsMenu to Core#3069
xezon merged 1 commit into
TheSuperHackers:mainfrom
Jaredl-Dev:unify/establishconnectionsmenu

Conversation

@Jaredl-Dev

Copy link
Copy Markdown

This moves the shared EstablishConnectionsMenu files into Core:

  • EstablishConnectionsMenu.h
  • EstablishConnectionsMenu.cpp

The Generals and Zero Hour copies differ only in the product-name banner inside the opening license comment.

Verification

  • Verified both moved Core files exactly match their pre-move Zero Hour copies.
  • 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
Jaredl-Dev force-pushed the unify/establishconnectionsmenu branch from c114f01 to a0f9253 Compare August 7, 2026 05:14

@xezon xezon left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks correct

@xezon xezon changed the title unify(establishconnectionsmenu): Move EstablishConnectionsMenu to Core unify(gui): Move EstablishConnectionsMenu to Core Aug 7, 2026
@xezon xezon added Gen Relates to Generals ZH Relates to Zero Hour Unify Unifies code between Generals and Zero Hour labels Aug 7, 2026
@xezon

xezon commented Aug 7, 2026

Copy link
Copy Markdown

Needs to resolve conflicts

@Jaredl-Dev

Copy link
Copy Markdown
Author

Needs to resolve conflicts

Done

Jaredl-Dev added a commit to Jaredl-Dev/GeneralsGameCode that referenced this pull request Aug 7, 2026
@Jaredl-Dev
Jaredl-Dev force-pushed the unify/establishconnectionsmenu branch from 38abbbc to cad1bc5 Compare August 7, 2026 18:24
@Jaredl-Dev
Jaredl-Dev force-pushed the unify/establishconnectionsmenu branch from cad1bc5 to be5eceb Compare August 7, 2026 18:26
@xezon
xezon merged commit d823b28 into TheSuperHackers:main Aug 8, 2026
16 checks passed
@Jaredl-Dev
Jaredl-Dev deleted the unify/establishconnectionsmenu branch August 8, 2026 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Gen Relates to Generals Unify Unifies code between Generals and Zero Hour ZH Relates to Zero Hour

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants