fix(basetype): Add min/max template functions to BaseType.h

[JohnsterID]

• Merge after unify(common): Move common system files to Core needed for ParticleEditor #2185

Fixes: #2177 (closes the ternary operator workaround PR)
Alternative to: Ternary operator approach (less readable)

Adds lowercase min/max template functions to BaseType.h for GameEngine layer, providing readable alternatives to uppercase MIN/MAX macros and ternary operators.

Both BaseType.h and always.h provide min/max independently:
BaseType.h → GameEngine code that doesn't need WW3D
always.h → WWVegas/WW3D code

MinGW-w64 locally tested and CI tested: https://github.com/JohnsterID/GeneralsGameCode/actions/runs/21322546177

TODO

• Rebase on Main after BaseType.h is in Core

[xezon]

I have a change coming soon for moving BaseType.h to Core, so this will need to wait for a moment.

[JohnsterID]

Moving it to Core would be good. I'll wait out.

[xezon]

Looks good. Finalize and Merge after moving BaseType.h to Core.

[xezon]

This can now proceed

[greptile-apps]

Greptile Overview

Greptile Summary

Adds lowercase min/max template functions to BaseType.h for the GameEngine layer, providing type-safe alternatives to the uppercase MIN/MAX macros. The implementation uses the same header guard _MIN_MAX_TEMPLATES_DEFINED_ as always.h to prevent duplicate definitions when both headers are included.

Key changes:

• Added template functions min<T> and max<T> with #undef guards to handle Windows macro conflicts
• Updated RealRange::combine to use the new lowercase functions instead of uppercase macros
• Maintains compatibility with WWVegas/WW3D code that uses always.h

The implementation is sound and follows the same pattern as always.h (lines 224-253). The changes improve type safety and readability compared to both macros and ternary operators.

Confidence Score: 4/5

• This PR is safe to merge with minimal risk, containing only additive template functions and a single macro-to-function replacement
• Score reflects that the implementation follows established patterns from always.h, uses proper header guards to prevent conflicts, and makes only minimal changes to existing code (RealRange::combine). The only concern is minor style inconsistency in the comment format.
• No files require special attention

Important Files Changed

Filename	Overview
Core/Libraries/Include/Lib/BaseType.h	Added lowercase min/max template functions with header guards to prevent conflicts with WWVegas headers, replacing uppercase MIN/MAX macro usage in RealRange::combine

Sequence Diagram

sequenceDiagram
    participant GE as GameEngine Code
    participant BT as BaseType.h
    participant RR as RealRange::combine
    participant MT as min/max templates

    Note over GE,MT: Compilation Flow

    GE->>BT: #include "Lib/BaseType.h"
    BT->>BT: Check _MIN_MAX_TEMPLATES_DEFINED_
    alt Not defined
        BT->>BT: #undef min/max (clear Windows macros)
        BT->>MT: Define min<T>(a,b) template
        BT->>MT: Define max<T>(a,b) template
        BT->>BT: Set _MIN_MAX_TEMPLATES_DEFINED_
    else Already defined (e.g., from always.h)
        BT->>BT: Skip template definitions
    end

    Note over GE,RR: Runtime Usage

    GE->>RR: Call combine(other)
    RR->>MT: Call min(lo, other.lo)
    MT-->>RR: Return smaller Real value
    RR->>MT: Call max(hi, other.hi)
    MT-->>RR: Return larger Real value
    RR-->>GE: Updated range

Loading

[greptile-apps]

_{1 file reviewed, 1 comment}

_{Edit Code Review Agent Settings | Greptile}