[GEN] Backports various things from ZH #688
Closed
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
|
Seems like a lot to change all in one PR. |
In tomsons we trust :) |
tomsons26
force-pushed
the
backports
branch
2 times, most recently
from
599e75f to
2645e4f
Compare
This was referenced Apr 23, 2025
|
@tomsons26 What are the plans for this draft PR? |
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 25, 2025
Reverting unification to avoid conflicts with: - PR TheSuperHackers#688 (tomsons26): Backports various things from ZH - PR TheSuperHackers#1049 (Caball009): Add missing virtual destructors - PR TheSuperHackers#1668 (jbremer): Prevent buffer overflows in NetPacket Files reverted: - ConnectionManager.h, StagingRoomGameInfo.h, LANGameInfo.h - networkutil.h, NetPacket.cpp
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 25, 2025
Reverting unification of these files to avoid conflicts with: - PR TheSuperHackers#654 (tomsons26): Cleans up inconsistencies - PR TheSuperHackers#670 (zzambers): Replacements for rest of asm code - PR TheSuperHackers#688 (tomsons26): Backports various things from ZH - PR TheSuperHackers#1066 (xezon): Prevent AMD/ATI driver crash - PR TheSuperHackers#1703 (Stubbjax): Add replay archive feature - PR TheSuperHackers#1741 (Skyaero42): Remove redundant include guards Files reverted: - BitFlagsIO.h, DataChunk.h, GameType.h, List.h - Money.h, Radar.h, Recorder.h, SpecialPowerMaskType.h, StackDump.h - NameKeyGenerator.cpp, GameCommon.cpp, StackDump.cpp
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 25, 2025
Reverting unification to avoid conflicts with: - PR TheSuperHackers#654 (tomsons26): Cleans up inconsistencies - PR TheSuperHackers#688 (tomsons26): Backports various things from ZH Files reverted: Color.h, Mouse.h, Color.cpp
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 25, 2025
Reverting unification to avoid conflicts with: - PR TheSuperHackers#654 (tomsons26): Cleans up inconsistencies - PR TheSuperHackers#688 (tomsons26): Backports various things from ZH Files reverted: Color.h, Mouse.h, Color.cpp
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 25, 2025
Reverting unification to avoid conflicts with: - PR TheSuperHackers#688 (tomsons26): Backports various things from ZH - PR TheSuperHackers#1049 (Caball009): Add missing virtual destructors - PR TheSuperHackers#1668 (jbremer): Prevent buffer overflows in NetPacket Files reverted: - ConnectionManager.h, StagingRoomGameInfo.h, LANGameInfo.h - networkutil.h, NetPacket.cpp
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 25, 2025
Reverting unification to avoid conflicts with: - PR TheSuperHackers#688 (tomsons26): Backports various things from ZH - PR TheSuperHackers#1049 (Caball009): Add missing virtual destructors Files reverted (kept in Generals/MD): - ConnectionManager.h, StagingRoomGameInfo.h, LANGameInfo.h, networkutil.h Note: NetPacket.cpp stays in Core (Connection.cpp depends on it). PR TheSuperHackers#1668 buffer overflow fix can be merged manually later.
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 26, 2025
Reverting unification of these files to avoid conflicts with: - PR TheSuperHackers#654 (tomsons26): Cleans up inconsistencies - PR TheSuperHackers#670 (zzambers): Replacements for rest of asm code - PR TheSuperHackers#688 (tomsons26): Backports various things from ZH - PR TheSuperHackers#1066 (xezon): Prevent AMD/ATI driver crash - PR TheSuperHackers#1703 (Stubbjax): Add replay archive feature - PR TheSuperHackers#1741 (Skyaero42): Remove redundant include guards Files reverted: - BitFlagsIO.h, DataChunk.h, GameType.h, List.h - Money.h, Radar.h, Recorder.h, SpecialPowerMaskType.h, StackDump.h - NameKeyGenerator.cpp, GameCommon.cpp, StackDump.cpp
bobtista
added a commit
to bobtista/GeneralsGameCode
that referenced
this pull request
Oct 26, 2025
Reverting unification to avoid conflicts with: - PR TheSuperHackers#654 (tomsons26): Cleans up inconsistencies - PR TheSuperHackers#688 (tomsons26): Backports various things from ZH Files reverted: Color.h, Mouse.h, Color.cpp
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.
No description provided.