unify(helper): Move Object helper modules to Core

[Jaredl-Dev]

This moves eight Object helper header/source pairs into Core:

• ObjectDefectionHelper
• ObjectHelper
• ObjectRepulsorHelper
• ObjectSMCHelper
• ObjectWeaponStatusHelper
• StatusDamageHelper
• SubdualDamageHelper
• TempWeaponBonusHelper

Five pairs were shared by Generals and Zero Hour. Their 10 files differ only in the product-name banner inside the opening license comment.

The remaining three helpers were Zero Hour-only. StatusDamageHelper and TempWeaponBonusHelper compile for both products but have no Generals call sites. SubdualDamageHelper remains guarded by RTS_ZEROHOUR because its implementation calls subdual-damage methods absent from Generals' BodyModuleInterface.

Validation

• Win32 Release builds succeed for both Generals and Zero Hour.
• VC6 Release builds succeed for both Generals and Zero Hour.
• Verified the 10 shared files match after normalizing the product-name banner and that the three Zero Hour-only helpers have no Generals call sites.

[qodo-free-for-open-source-projects]

PR Summary by Qodo

Unify object helpers in Core GameEngine

✨ Enhancement ⚙️ Configuration changes 🕐 20-40 Minutes

AI Description

• Centralizes eight object helpers shared across Generals and Zero Hour.
• Removes duplicate product copies and rewires both builds to Core sources.
• Keeps subdual-damage implementation restricted to Zero Hour APIs.

Diagram

graph TD
  Mover["Unify Script"] --> Core["Core GameEngine"] --> Helpers["Object Helpers"] --> Generals["Generals Build"]
  Helpers --> ZeroHour["Zero Hour Build"]
  Helpers --> Guard{"RTS_ZEROHOUR"} --> ZeroHour

Loading

High-Level Assessment

Centralizing identical and compatible helper modules in Core is the appropriate approach because it removes divergent product copies while preserving product-specific behavior with a narrow compile-time guard. Keeping separate copies or forwarding wrappers would retain unnecessary duplication and build maintenance.

Files changed (20) +64 / -42

Refactor (15) +0 / -0

ObjectDefectionHelper.hCentralize defection helper declaration +0/-0

Centralize defection helper declaration

• Adds the shared ObjectDefectionHelper declaration to Core, replacing product-owned copies.

Core/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h

ObjectHelper.hCentralize object helper base declaration +0/-0

Centralize object helper base declaration

• Adds the common ObjectHelper base-class declaration to Core for reuse by both products.

Core/GameEngine/Include/GameLogic/Module/ObjectHelper.h

ObjectRepulsorHelper.hCentralize repulsor helper declaration +0/-0

Centralize repulsor helper declaration

• Adds the shared ObjectRepulsorHelper declaration to the Core module headers.

Core/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h

ObjectSMCHelper.hCentralize model-condition helper declaration +0/-0

Centralize model-condition helper declaration

• Adds the shared ObjectSMCHelper declaration to Core for both product builds.

Core/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h

ObjectWeaponStatusHelper.hCentralize weapon-status helper declaration +0/-0

Centralize weapon-status helper declaration

• Adds the shared ObjectWeaponStatusHelper declaration to Core, including its final-phase update behavior.

Core/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h

StatusDamageHelper.hMove status-damage helper declaration to Core +0/-0

Move status-damage helper declaration to Core

• Relocates the Zero Hour-originated StatusDamageHelper declaration into the shared Core tree, where it can compile for either product.

Core/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h

SubdualDamageHelper.hMove subdual-damage helper declaration to Core +0/-0

Move subdual-damage helper declaration to Core

• Relocates the SubdualDamageHelper declaration into Core while its implementation remains product-gated.

Core/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h

TempWeaponBonusHelper.hMove temporary weapon bonus declaration to Core +0/-0

Move temporary weapon bonus declaration to Core

• Relocates the TempWeaponBonusHelper declaration into the shared Core module tree.

Core/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h

ObjectDefectionHelper.cppCentralize defection helper implementation +0/-0

Centralize defection helper implementation

• Adds the shared defection timer, effects, and serialization implementation to Core.

Core/GameEngine/Source/GameLogic/Object/Helper/ObjectDefectionHelper.cpp

ObjectHelper.cppCentralize object helper base implementation +0/-0

Centralize object helper base implementation

• Adds the common helper sleep scheduling and serialization implementation to Core.

Core/GameEngine/Source/GameLogic/Object/Helper/ObjectHelper.cpp

ObjectRepulsorHelper.cppCentralize repulsor helper implementation +0/-0

Centralize repulsor helper implementation

• Adds the shared repulsor-status clearing helper implementation to Core.

Core/GameEngine/Source/GameLogic/Object/Helper/ObjectRepulsorHelper.cpp

ObjectSMCHelper.cppCentralize model-condition helper implementation +0/-0

Centralize model-condition helper implementation

• Adds the shared special model-condition clearing implementation to Core.

Core/GameEngine/Source/GameLogic/Object/Helper/ObjectSMCHelper.cpp

ObjectWeaponStatusHelper.cppCentralize weapon-status helper implementation +0/-0

Centralize weapon-status helper implementation

• Adds the shared weapon-status helper lifecycle and serialization implementation to Core.

Core/GameEngine/Source/GameLogic/Object/Helper/ObjectWeaponStatusHelper.cpp

StatusDamageHelper.cppMove status-damage helper implementation to Core +0/-0

Move status-damage helper implementation to Core

• Relocates the status-damage helper implementation from the Zero Hour tree into Core without introducing Generals call sites.

Core/GameEngine/Source/GameLogic/Object/Helper/StatusDamageHelper.cpp

TempWeaponBonusHelper.cppMove temporary weapon bonus implementation to Core +0/-0

Move temporary weapon bonus implementation to Core

• Relocates the temporary weapon bonus helper implementation into Core without adding Generals call sites.

Core/GameEngine/Source/GameLogic/Object/Helper/TempWeaponBonusHelper.cpp

Other (5) +64 / -42

CMakeLists.txtBuild unified object helpers from Core +16/-16

Build unified object helpers from Core

• Activates eight object helper header/source pairs in the Core GameEngine source list so product builds consume the centralized implementations.

Core/GameEngine/CMakeLists.txt

SubdualDamageHelper.cppGuard unified subdual implementation for Zero Hour +5/-0

Guard unified subdual implementation for Zero Hour

• Moves the subdual healing helper into Core and wraps its implementation with RTS_ZEROHOUR because Generals lacks the required BodyModuleInterface methods.

Core/GameEngine/Source/GameLogic/Object/Helper/SubdualDamageHelper.cpp

CMakeLists.txtStop compiling local Generals helper copies +10/-10

Stop compiling local Generals helper copies

• Comments out the five former Generals helper header/source entries so the build resolves them from Core.

Generals/Code/GameEngine/CMakeLists.txt

CMakeLists.txtStop compiling local Zero Hour helper copies +16/-16

Stop compiling local Zero Hour helper copies

• Comments out all eight former Zero Hour helper header/source entries in favor of the centralized Core files.

GeneralsMD/Code/GameEngine/CMakeLists.txt

unify_move_files.pyRecord object helper migration commands +17/-0

Record object helper migration commands

• Adds commented migration commands documenting which shared files were unified and which Zero Hour-only files were moved into Core.

scripts/cpp/unify_move_files.py

[qodo-free-for-open-source-projects]

Code Review by Qodo

🐞 Bugs (0) 📘 Rule violations (0) 📎 Requirement gaps (0)

Great, no issues found!

Qodo reviewed your code and found no material issues that require review

Tip of the day

💡 Did you know, you can start a comment with 'qodo' or '@qodo' to chat about any finding

More tips ↗ | Customize Qodo ↗ | Qodo docs ↗

Previous reviews

Review updated until commit 9f4e3d8 ⚖️ Balanced

Results up to commit 152559a

🐞 Bugs (0) 📘 Rule violations (0) 📎 Requirement gaps (0)

Great, no issues found!

Qodo reviewed your code and found no material issues that require review

[Skyaero42]

ZH has three files (StatusDamageHelper, SubdualDamageHelper and TempWeaponBonusHelper) that are not in generals, but are in the Helper directory. These three should also be moved

[Jaredl-Dev]

ZH has three files (StatusDamageHelper, SubdualDamageHelper and TempWeaponBonusHelper) that are not in generals, but are in the Helper directory. These three should also be moved

Corrected the PR.

[qodo-free-for-open-source-projects]

Code review by qodo was updated up to the latest commit 9f4e3d8

[Skyaero42]

SubdualDamageHelper remains guarded by RTS_ZEROHOUR because its implementation calls subdual-damage methods absent from Generals' BodyModuleInterface

Not entirely happy with this. Once BodyModuleInterface, there is a high chance we forget about this and the RTS_ZEROHOUR guard (unnecessarily) stays. Would like a second opinion on that.

[Jaredl-Dev]

SubdualDamageHelper remains guarded by RTS_ZEROHOUR because its implementation calls subdual-damage methods absent from Generals' BodyModuleInterface

Not entirely happy with this. Once BodyModuleInterface, there is a high chance we forget about this and the RTS_ZEROHOUR guard (unnecessarily) stays. Would like a second opinion on that.

Sorry, I don't get what you are saying.