Skip to content

sync: merge TheSuperHackers main (04-11-2026)#85

Merged
fbraz3 merged 3 commits intomainfrom
thesuperhackers-sync-04-11-2026
Apr 11, 2026
Merged

sync: merge TheSuperHackers main (04-11-2026)#85
fbraz3 merged 3 commits intomainfrom
thesuperhackers-sync-04-11-2026

Conversation

@fbraz3
Copy link
Copy Markdown
Owner

@fbraz3 fbraz3 commented Apr 11, 2026

Summary

Sync upstream changes from TheSuperHackers/GeneralsGameCode main into GeneralsX while preserving the existing cross-platform architecture.

  • Branch: thesuperhackers-sync-04-11-2026
  • Merge commit: 33699c1d0
  • Scope imported: 204 files changed (mostly WorldBuilder headers/sources, plus small Core/CMake updates)

Key Merge Decisions

  • Kept GeneralsX cross-platform stack intact (SDL3 + DXVK + OpenAL + FFmpeg paths remain).
  • Accepted upstream updates where they did not remove or downgrade cross-platform behavior.
  • No textual conflicts occurred in this merge (ort auto-merge), so risk focus is semantic/build validation.
  • Build-system delta reviewed: cmake/compilers.cmake adds -Wsuggest-override for non-MSVC.
  • Core delta reviewed: Core/GameEngine/Include/GameClient/ParticleSys.h explicit virtual keywords in dummy manager class.

Validation

  • macOS configure: PASS
  • macOS Zero Hour build: PASS after clean rebuild confirmation by maintainer
  • Linux configure/build: PENDING
  • Runtime smoke (GeneralsXZH / GeneralsX): PENDING

Risk Areas For Review

  • WorldBuilder API/header harmonization in Generals/Code/Tools/WorldBuilder/** and GeneralsMD/Code/Tools/WorldBuilder/**
  • Warnings promoted by -Wsuggest-override may surface latent portability issues over time
  • Runtime paths still require explicit smoke checks on both products after this upstream sync

Test Checklist

  • Configure on macOS
  • Configure on Linux
  • Configure on Windows (if applicable for this branch)
  • Build GeneralsXZH
  • Build GeneralsX
  • Launch game binaries
  • Reach main menu
  • Skirmish gameplay smoke
  • Campaign flow smoke
  • Audio playback
  • Video playback
  • Renderer stability (DXVK path)
  • Input handling (SDL3 path)
  • Mod loading (if affected)

Copilot AI review requested due to automatic review settings April 11, 2026 19:30
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Syncs upstream TheSuperHackers/GeneralsGameCode main into GeneralsX, primarily taking WorldBuilder/GUIEdit signature hygiene updates (adding override, virtual) and small build/core adjustments while aiming to preserve cross-platform behavior.

Changes:

  • Enable -Wsuggest-override for non-MSVC builds in CMake.
  • Add override (and sometimes explicit virtual) across many WorldBuilder/GUIEdit classes to tighten override correctness.
  • Change selection-group double-press timing to use wall-clock milliseconds and m_doubleClickTimeMS instead of fixed “20” frame threshold.

Reviewed changes

Copilot reviewed 204 out of 204 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
cmake/compilers.cmake Adds a non-MSVC warning flag intended to improve override hygiene.
Core/GameEngine/Include/GameClient/ParticleSys.h Adds explicit virtual keywords to dummy manager overrides.
Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp Switches group double-press detection from frames to milliseconds + global config threshold.
Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h Adds override (and related signature tightening) to GUI edit display stubs.
Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h Adds override to window manager virtuals.
Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h Adds override on MFC virtual overrides.
Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h Adds override on MFC virtual overrides.
Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h Adds override on MFC virtual overrides.
Generals/Code/Tools/WorldBuilder/include/BorderTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/BrushTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/brushoptions.h Adds override on options panel virtual overrides + popup slider overrides.
Generals/Code/Tools/WorldBuilder/include/BuildList.h Adds override on options panel virtual overrides + popup slider overrides.
Generals/Code/Tools/WorldBuilder/include/BuildListTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/CameraOptions.h Adds override on dialog virtual overrides + popup slider overrides.
Generals/Code/Tools/WorldBuilder/include/CellWidth.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h Adds override on control destructor.
Generals/Code/Tools/WorldBuilder/include/ContourOptions.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/CUndoable.h Adds override to undoable hierarchy virtuals/destructors.
Generals/Code/Tools/WorldBuilder/include/DrawObject.h Adds override for RenderObjClass interface methods/destructor.
Generals/Code/Tools/WorldBuilder/include/EditAction.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/EditCondition.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/EditGroup.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/EditParameter.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h Adds override on options panel virtual overrides + popup slider overrides.
Generals/Code/Tools/WorldBuilder/include/FeatherTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/FenceOptions.h Adds override on options panel virtual overrides.
Generals/Code/Tools/WorldBuilder/include/FenceTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h Adds override on dialog virtual overrides + popup slider overrides.
Generals/Code/Tools/WorldBuilder/include/GroveOptions.h Adds override on options panel virtual overrides.
Generals/Code/Tools/WorldBuilder/include/GroveTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h Adds override on dialog virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/LayersList.h Adds override on dialog virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/LightOptions.h Adds override on options panel virtual overrides.
Generals/Code/Tools/WorldBuilder/include/MainFrm.h Adds override on frame virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/MapSettings.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h Adds override on options panel virtual overrides + popup slider overrides.
Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/MoundOptions.h Adds override on options panel virtual overrides + popup slider overrides.
Generals/Code/Tools/WorldBuilder/include/MoundTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/MyToolbar.h Adds override on WindowProc + destructor.
Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h Adds override on options panel virtual overrides.
Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h Adds override on control destructor.
Generals/Code/Tools/WorldBuilder/include/ObjectTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/OpenMap.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h Adds override on dialog virtual override.
Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h Adds override on dialog virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/PointerTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/PolygonTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/propedit.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/RampOptions.h Adds override on options panel destructor.
Generals/Code/Tools/WorldBuilder/include/RampTool.h Adds override on tool virtual overrides.
Generals/Code/Tools/WorldBuilder/include/RoadOptions.h Adds override on options panel virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/RoadTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/SaveMap.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h Adds override on options panel virtual overrides + popup slider overrides.
Generals/Code/Tools/WorldBuilder/include/ScorchTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h Adds override on property page virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h Adds override on property page virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h Adds override on property page virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h Adds override on dialog virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h Adds override on property page virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h Adds override on property page virtual overrides.
Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h Adds override on property page virtual overrides.
Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h Adds override on property page virtual overrides.
Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h Adds override on property page virtual overrides.
Generals/Code/Tools/WorldBuilder/include/teamsdialog.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h Adds override on options panel virtual overrides + popup slider overrides.
Generals/Code/Tools/WorldBuilder/include/TerrainModal.h Adds override on dialog virtual overrides.
Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h Adds override on control destructor.
Generals/Code/Tools/WorldBuilder/include/TileTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/WaterOptions.h Adds override on options panel virtual overrides + popup slider overrides.
Generals/Code/Tools/WorldBuilder/include/WaterTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h Adds override on frame virtual overrides/destructors.
Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h Adds override on render object virtual overrides.
Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h Adds override on control virtual overrides/destructors.
Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h Adds override on height map edit destructor.
Generals/Code/Tools/WorldBuilder/include/WbView3d.h Adds override on view + DX8 cleanup hook overrides.
Generals/Code/Tools/WorldBuilder/include/WbView.h Adds override on view virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h Adds override on options panel dialog overrides.
Generals/Code/Tools/WorldBuilder/include/WaypointTool.h Adds override on tool virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h Adds override on app virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h Adds override on document virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h Adds override on view virtual overrides/destructor.
Generals/Code/Tools/WorldBuilder/src/ScriptDialog.cpp Adds override to local OutputStream implementation.
Generals/Code/Tools/WorldBuilder/src/WorldBuilder.cpp Adds override to helper classes’ virtuals.
Generals/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp Adds override to OutputStream implementations.
GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp Switches group double-press detection from frames to milliseconds + global config threshold.
GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h Adds override (and related signature tightening) to GUI edit display stubs.
GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h Adds override to window manager virtuals.
GeneralsMD/Code/Tools/wdump/wdump.cpp Adds override to MFC command-line parser and dialog exchange.
GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h Adds override on MFC virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h Adds override on options panel virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h Adds override on options panel virtual overrides + popup slider overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h Adds override on options panel virtual overrides + popup slider overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h Adds override on dialog virtual overrides + popup slider overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/CFixTeamOwnerDialog.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h Adds override on control destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h Adds override to undoable hierarchy virtuals/destructors.
GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h Adds override for RenderObjClass interface methods/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h Adds override on dialog virtual overrides (and WindowProc override for custom tree).
GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h Adds override on options panel virtual overrides + popup slider overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h Adds override on options panel virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h Adds override on dialog virtual overrides + popup slider overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h Adds override on options panel virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h Adds override on dialog virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h Adds override on dialog virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h Adds override on options panel virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h Adds override on frame virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h Adds override on dialog/popup slider virtual overrides + destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h Adds override on options panel virtual overrides + popup slider overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h Adds override on options panel virtual overrides + popup slider overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h Adds override on WindowProc + destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h Adds override on options panel virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h Adds override on control destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h Adds override on dialog virtual override.
GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h Adds override on dialog virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h Adds override on options panel destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h Adds override on tool virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h Adds override on options panel virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h Adds override on options panel virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h Adds override on options panel virtual overrides + popup slider overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h Adds override on property page virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h Adds override on property page virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h Adds override on property page virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h Adds override on dialog virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h Adds override on property page virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h Adds override on property page virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h Adds override on property page virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h Adds override on property page virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/TeamObjectProperties.h Adds override on property page virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h Adds override on property page virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h Adds override on options panel virtual overrides + popup slider overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h Adds override on dialog virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h Adds override on control destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h Adds override on options panel virtual overrides + popup slider overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h Adds override on frame virtual overrides/destructors.
GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h Adds override on render object virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h Adds override on control virtual overrides/destructors.
GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h Adds override on height map edit destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/WbView3d.h Adds override on view + DX8 cleanup hook overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/WbView.h Adds override on view virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h Adds override on options panel virtual overrides.
GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h Adds override on tool virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h Adds override on app virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h Adds override on document virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h Adds override on view virtual overrides/destructor.
GeneralsMD/Code/Tools/WorldBuilder/src/ScriptDialog.cpp Adds override to local OutputStream implementation.
GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilder.cpp Adds override to helper classes’ virtuals.
GeneralsMD/Code/Tools/WorldBuilder/src/WorldBuilderDoc.cpp Adds override to OutputStream implementations.
Comments suppressed due to low confidence (5)

cmake/compilers.cmake:1

  • -Wsuggest-override is not universally supported across all non-MSVC compilers/toolchains (and may be treated as an error depending on global warning-as-error settings). Consider guarding it with a compiler-flag check (e.g., check_cxx_compiler_flag) and only adding it when supported, or scoping it per-compiler (GCC/Clang) to avoid breaking builds on less common/older toolchains.
    GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp:1
  • Same portability concern as the Generals variant: timeGetTime() ties this logic to Win32 and may fail to compile/link on macOS/Linux. Prefer the project’s cross-platform timing abstraction (or SDL ticks/std::chrono behind an abstraction) so the upstream sync doesn’t regress non-Windows builds.
    GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp:1
  • Same portability concern as the Generals variant: timeGetTime() ties this logic to Win32 and may fail to compile/link on macOS/Linux. Prefer the project’s cross-platform timing abstraction (or SDL ticks/std::chrono behind an abstraction) so the upstream sync doesn’t regress non-Windows builds.
    GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp:1
  • Same portability concern as the Generals variant: timeGetTime() ties this logic to Win32 and may fail to compile/link on macOS/Linux. Prefer the project’s cross-platform timing abstraction (or SDL ticks/std::chrono behind an abstraction) so the upstream sync doesn’t regress non-Windows builds.
    GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp:1
  • Same portability concern as the Generals variant: timeGetTime() ties this logic to Win32 and may fail to compile/link on macOS/Linux. Prefer the project’s cross-platform timing abstraction (or SDL ticks/std::chrono behind an abstraction) so the upstream sync doesn’t regress non-Windows builds.

@fbraz3 fbraz3 merged commit dff5a23 into main Apr 11, 2026
10 of 11 checks passed
@fbraz3 fbraz3 deleted the thesuperhackers-sync-04-11-2026 branch April 11, 2026 19:55
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.

3 participants