merge: sync with TheSuperHackers upstream - 2026-06-08#158
Merged
Conversation
…patcher into separate functions (TheSuperHackers#2702)
…ers-sync-06-08-2026 # Conflicts: # Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Description
Sync with upstream TheSuperHackers/GeneralsGameCode — imports 4 upstream commits without regressing the GeneralsX cross-platform architecture.
Upstream Changes Merged
deb728c0fstd::vectorfor O(1) indexed access98f1db992a1358a97eCore/Libraries/Source/WWVegas/WW3D2/0e7f686e8logicMessageDispatcherswitch cases into ~40 individual handler methodsConflict Resolution
1 conflict resolved:
sortingrenderer.cpp(modify/delete) — accepted upstream deletion (file moved to Core/). No platform-specific logic was lost.All auto-merged changes are internal engine refactors that do not touch platform abstraction layers (SDL3, DXVK, OpenAL, FFmpeg).
Build Validation
GeneralsXZHGeneralsXRisk Areas
GameLogicDispatch.cpp— large refactor, should be reviewed for correctnessNetCommandMsg.h/cppandMessageStream.h/cpp— vector conversion changes memory ownership model