unify(network): Merge GameNetwork, GameSpy and adjacent code #1735
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xezon
added
Gen
xezon
commented
Oct 23, 2025
xezon
force-pushed
the
xezon/unify-gamenetwork
branch
from
45d2a7e to
889d140
Compare
Author
|
List of changes to Generals and Zero Hour added. Did another pass on the merge and fixed a few things. |
bobtista
reviewed
Oct 25, 2025
bobtista
reviewed
Oct 25, 2025
bobtista
reviewed
Oct 25, 2025
| TheGameSpyPeerMessageQueue->addRequest(req); | ||
| } | ||
|
|
||
| s_prevMsg = message; |
There was a problem hiding this comment.
This still sets prevMsg even if nothing is sent - eg if names isEmpty, maybe move this line into if (!names.isEmpty())?
Author
There was a problem hiding this comment.
If it is a bug then it would have to be fixed outside the merging. We are just copying the bugs to Generals :)
bobtista
reviewed
Oct 25, 2025
Skyaero42
approved these changes
Oct 25, 2025
Skyaero42
left a comment
Skyaero42
left a comment
There was a problem hiding this comment.
Merger looks good. Tested Generals and seems to run fine.
xezon
force-pushed
the
xezon/unify-gamenetwork
branch
from
889d140 to
49ca656
Compare
xezon
added a commit
that referenced
this pull request
Oct 29, 2025
fbraz3
pushed a commit
to fbraz3/GeneralsX
that referenced
this pull request
Nov 10, 2025
fbraz3
pushed a commit
to fbraz3/GeneralsX
that referenced
this pull request
Nov 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge with Rebase
This change merges GameNetwork, GameSpy and adjacent code.
Only GUIUtil.cpp is not merged, because it has Generals Challenge dependencies and perhaps requires some extra care. Can be done another time.
Changes to Generals
Changes to Zero Hour
TODO