bugfix: Restore retail compatibility after retail behavior flags change

[Caball009]

• Follow up for refactor: Split preserve retail behavior flags #2691

#2691 Turned off some retail behavior which introduces mismatches. This PR aims to fix that.

TODO:

• Replicate in Generals.
  Generals has one fewer change because this only exists in Zero Hour: RETAIL_COMPATIBLE_CRC || PRESERVE_STRUCTURE_STEALTH_DURING_REPAIR in StealthUpdate::allowedToStealth.

[greptile-apps]

Greptile Summary

This PR corrects preprocessor guards across both the Generals/ and GeneralsMD/ codebases to properly include RETAIL_COMPATIBLE_CRC alongside their corresponding PRESERVE_* flags, ensuring retail-compatible behavior is active whenever either flag is set.

• Logical rewrites (no semantic change): Several conditions were reordered (A || B → B || A) or restructured using De Morgan's law (!A && !B → !(A || B)) across TunnelTracker, Player, PoisonedBehavior, ObjectCreationList, and TunnelContain.
• Real behavior changes: ActiveBody.cpp now records m_lastDamageTimestamp during healing events when RETAIL_COMPATIBLE_CRC=1; StealthUpdate.cpp (GeneralsMD) enables the healing-damage stealth exception in retail mode; CrateCollide.cpp enables multi-crate pickup by default when RETAIL_COMPATIBLE_CRC=1.
• Known incomplete item: The StealthUpdate.cpp fix is applied to GeneralsMD only; the Generals variant does not have the STEALTH_NOT_WHILE_TAKING_DAMAGE feature at all, so the ActiveBody.cpp timestamp change there is harmless.

Confidence Score: 5/5

Safe to merge — all changes correctly expand retail-compatibility guards or are logically equivalent rewrites with no semantic impact.

The majority of changes are either commutative OR-operand reorderings or De Morgan rewrites with no behavioral difference. The three real behavior changes (ActiveBody timestamp during healing, StealthUpdate healing exception in ZeroHour, CrateCollide multi-pickup default) are the intended fixes. The Generals StealthUpdate.cpp omission is harmless because the STEALTH_NOT_WHILE_TAKING_DAMAGE flag does not exist in the Generals codebase.

No files require special attention.

Important Files Changed

Filename	Overview
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthUpdate.cpp	Adds RETAIL_COMPATIBLE_CRC to the structure-stealth repair guard, enabling the healing-damage exception in retail mode; properly paired with the ActiveBody.cpp timestamp change.
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp	Same real behavior change as Generals: m_lastDamageTimestamp now updated during healing when RETAIL_COMPATIBLE_CRC=1, paired with the matching StealthUpdate fix in this PR.
Generals/Code/GameEngine/Source/GameLogic/Object/Body/ActiveBody.cpp	Adds RETAIL_COMPATIBLE_CRC to the stealth-repair guard so m_lastDamageTimestamp is set during healing events under retail mode; safe because Generals has no STEALTH_NOT_WHILE_TAKING_DAMAGE flag.
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp	Same m_allowMultiPickup change as Generals — correct retail compatibility restoration.
Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/CrateCollide.cpp	Extends m_allowMultiPickup default to be true when RETAIL_COMPATIBLE_CRC=1, restoring retail crate behavior.
Generals/Code/GameEngine/Source/Common/RTS/Player.cpp	Rewrites !PRESERVE_TUNNEL_HEAL_STACKING && !RETAIL_COMPATIBLE_CRC as !(RETAIL_COMPATIBLE_CRC
GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp	Same De Morgan rewrite as Generals Player.cpp — no behavioral difference.

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    RC[RETAIL_COMPATIBLE_CRC = 1]
    PS[PRESERVE_* flag = 1]

    RC -->|OR| TH[Tunnel heal stacking path\nTunnelTracker / TunnelContain / Player]
    PS -->|OR| TH

    RC -->|OR| SS[Structure stealth-during-repair\nActiveBody + StealthUpdate MD]
    PS2[PRESERVE_STRUCTURE_STEALTH_DURING_REPAIR] -->|OR| SS

    RC -->|OR| MP[Multi-crate pickup default\nCrateCollide]
    PS3[PRESERVE_MULTI_CRATE_PICKUP] -->|OR| MP

    RC -->|NOR| XPP[XP from poison kills fix DISABLED\nPoisonedBehavior]
    PS4[PRESERVE_NO_XP_FROM_POISON_KILLS] -->|NOR| XPP

    RC -->|NOR| XPO[XP from OCL kills fix DISABLED\nObjectCreationList]
    PS5[PRESERVE_NO_XP_FROM_OCL_KILLS] -->|NOR| XPO

Loading

_{Reviews (4): Last reviewed commit: "Replicated in Generals." | Re-trigger Greptile}

[Mauller]

If we do add the overall preserve retail flag pattern, it might be better to split out the custom configuration into a cmake file for the pre configured flags that we are setting.

[Caball009]

Every use of a PRESERVE_ macro (except PRESERVE_RETAIL_SCRIPTED_CAMERA) is now preceded by a RETAIL_COMPATIBLE_CRC macro.

[githubawn]

https://github.com/TheSuperHackers/GeneralsGameCode/actions/runs/26116319211/job/76806993700?pr=2730

Tested this merged with #2730. LGTM

[Mauller]

Looks good to me.

[Caball009]

Replicated in Generals.

Generals has one fewer change because this only exists in Zero Hour: RETAIL_COMPATIBLE_CRC || PRESERVE_STRUCTURE_STEALTH_DURING_REPAIR in StealthUpdate::allowedToStealth.

[xezon]

Looking good