Update master 2025 12

.clang-tidy

@@ -0,0 +1,167 @@
+# TheSuperHackers @build JohnsterID 15/09/2025 Add clang-tidy configuration for code quality analysis
+---
+# Clang-tidy configuration for GeneralsGameCode project
+# This configuration is tailored for a legacy C++98/C++20 hybrid codebase
+# with Windows-specific code and COM interfaces
+
+# Enable specific checks that are appropriate for this codebase
+Checks: >
+  -*,
+  bugprone-*,
+  -bugprone-easily-swappable-parameters,
+  -bugprone-implicit-widening-of-multiplication-result,
+  -bugprone-narrowing-conversions,
+  -bugprone-signed-char-misuse,
+  cert-*,
+  -cert-dcl21-cpp,
+  -cert-dcl50-cpp,
+  -cert-dcl58-cpp,
+  -cert-env33-c,
+  -cert-err58-cpp,
+  clang-analyzer-*,
+  -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
+  cppcoreguidelines-*,
+  -cppcoreguidelines-avoid-c-arrays,
+  -cppcoreguidelines-avoid-magic-numbers,
+  -cppcoreguidelines-avoid-non-const-global-variables,
+  -cppcoreguidelines-init-variables,
+  -cppcoreguidelines-macro-usage,
+  -cppcoreguidelines-no-malloc,
+  -cppcoreguidelines-owning-memory,
+  -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
+  -cppcoreguidelines-pro-bounds-constant-array-index,
+  -cppcoreguidelines-pro-bounds-pointer-arithmetic,
+  -cppcoreguidelines-pro-type-cstyle-cast,
+  -cppcoreguidelines-pro-type-reinterpret-cast,
+  -cppcoreguidelines-pro-type-union-access,
+  -cppcoreguidelines-pro-type-vararg,
+  -cppcoreguidelines-special-member-functions,
+  google-*,
+  -google-build-using-namespace,
+  -google-explicit-constructor,
+  -google-readability-casting,
+  -google-readability-todo,
+  -google-runtime-int,
+  -google-runtime-references,
+  hicpp-*,
+  -hicpp-avoid-c-arrays,
+  -hicpp-explicit-conversions,
+  -hicpp-no-array-decay,
+  -hicpp-signed-bitwise,
+  -hicpp-special-member-functions,
+  -hicpp-uppercase-literal-suffix,
+  -hicpp-use-auto,
+  -hicpp-vararg,
+  misc-*,
+  -misc-const-correctness,
+  -misc-include-cleaner,
+  -misc-non-private-member-variables-in-classes,
+  -misc-use-anonymous-namespace,
+  modernize-*,
+  -modernize-avoid-c-arrays,
+  -modernize-concat-nested-namespaces,
+  -modernize-loop-convert,
+  -modernize-pass-by-value,
+  -modernize-raw-string-literal,
+  -modernize-return-braced-init-list,
+  -modernize-use-auto,
+  -modernize-use-default-member-init,
+  -modernize-use-nodiscard,
+  -modernize-use-trailing-return-type,
+  performance-*,
+  -performance-avoid-endl,
+  portability-*,
+  readability-*,
+  -readability-avoid-const-params-in-decls,
+  -readability-braces-around-statements,
+  -readability-convert-member-functions-to-static,
+  -readability-function-cognitive-complexity,
+  -readability-identifier-length,
+  -readability-implicit-bool-conversion,
+  -readability-isolate-declaration,
+  -readability-magic-numbers,
+  -readability-named-parameter,
+  -readability-redundant-access-specifiers,
+  -readability-uppercase-literal-suffix
+
+# Treat warnings as errors for CI/CD
+WarningsAsErrors: false
+
+# Header filter to include project headers
+HeaderFilterRegex: '(Core|Generals|GeneralsMD|Dependencies)/.*\.(h|hpp)$'
+
+# Check options for specific rules
+CheckOptions:
+  # Naming conventions - adapted for the existing codebase style
+  - key: readability-identifier-naming.ClassCase
+    value: CamelCase
+  - key: readability-identifier-naming.StructCase
+    value: CamelCase
+  - key: readability-identifier-naming.FunctionCase
+    value: CamelCase
+  - key: readability-identifier-naming.MethodCase
+    value: CamelCase
+  - key: readability-identifier-naming.VariableCase
+    value: lower_case
+  - key: readability-identifier-naming.ParameterCase
+    value: lower_case
+  - key: readability-identifier-naming.MemberCase
+    value: lower_case
+  - key: readability-identifier-naming.MemberPrefix
+    value: m_
+  - key: readability-identifier-naming.ConstantCase
+    value: UPPER_CASE
+  - key: readability-identifier-naming.EnumConstantCase
+    value: UPPER_CASE
+  - key: readability-identifier-naming.MacroDefinitionCase
+    value: UPPER_CASE
+
+  # Performance settings
+  - key: performance-for-range-copy.WarnOnAllAutoCopies
+    value: true
+  - key: performance-unnecessary-value-param.AllowedTypes
+    value: 'AsciiString;UnicodeString;Utf8String;Utf16String'
+
+  # Modernize settings - be conservative for legacy code
+  - key: modernize-use-nullptr.NullMacros
+    value: 'NULL'
+  - key: modernize-replace-auto-ptr.IncludeStyle
+    value: llvm
+
+  # Readability settings
+  - key: readability-function-size.LineThreshold
+    value: 150
+  - key: readability-function-size.StatementThreshold
+    value: 100
+  - key: readability-function-size.BranchThreshold
+    value: 25
+  - key: readability-function-size.ParameterThreshold
+    value: 8
+  - key: readability-function-size.NestingThreshold
+    value: 6
+
+  # Bugprone settings
+  - key: bugprone-argument-comment.StrictMode
+    value: false
+  - key: bugprone-suspicious-string-compare.WarnOnImplicitComparison
+    value: true
+  - key: bugprone-suspicious-string-compare.WarnOnLogicalNotComparison
+    value: true
+
+  # Google style settings
+  - key: google-readability-braces-around-statements.ShortStatementLines
+    value: 2
+  - key: google-readability-function-size.StatementThreshold
+    value: 100
+
+  # CERT settings
+  - key: cert-dcl16-c.NewSuffixes
+    value: 'L;LL;LU;LLU'
+  - key: cert-oop54-cpp.WarnOnlyIfThisHasSuspiciousField
+    value: false
+
+# Use .clang-format for formatting suggestions
+FormatStyle: file
+
+# Exclude certain directories and files
+# Note: This is handled by HeaderFilterRegex above, but can be extended

.github/copilot-instructions.md

@@ -0,0 +1,133 @@
+# AI Coding Agent Instructions
+
+## Project Overview
+
+This is the **GeneralsGameCode** project - a community-driven effort to fix and improve the classic RTS games *Command & Conquer: Generals* and *Zero Hour*. The codebase has been modernized from Visual Studio 6/C++98 to Visual Studio 2022/C++20 while maintaining retail compatibility.
+
+## Architecture
+
+### Dual Game Structure
+- **Generals/**: Original C&C Generals (v1.08) codebase
+- **GeneralsMD/**: Zero Hour expansion (v1.04) codebase - **primary focus**
+- **Core/**: Shared game engine and libraries used by both games
+
+### Key Components
+- **Core/GameEngine/**: Base game engine with GameClient/GameLogic separation
+- **Core/Libraries/**: Internal libraries including WWVegas graphics framework
+- **Core/GameEngineDevice/**: Platform-specific rendering (DirectX 8)
+- **Core/Tools/**: Development tools (W3DView, texture compression, etc.)
+- **Dependencies/**: External dependencies (MaxSDK for VC6, utilities)
+
+## Build System
+
+### CMake Presets (Critical)
+- **vc6**: Visual Studio 6 compatible build (retail compatibility required)
+- **win32**: Modern Visual Studio 2022 build
+- **vc6-debug/vc6-profile**: Debug/profiling variants
+- Use `cmake --preset <preset-name>` followed by `cmake --build build/<preset>`
+
+### Build Commands
+```bash
+# Configure with specific preset
+cmake --preset vc6
+
+# Build (from project root)
+cmake --build build/vc6
+
+# Build with tools and extras
+cmake --build build/vc6 --target <game>_tools <game>_extras
+```
+
+### Retail Compatibility
+- VC6 builds are required for replay compatibility testing
+- Debug builds break retail compatibility
+- Use RTS_BUILD_OPTION_DEBUG=OFF for compatibility testing
+
+## Development Workflow
+
+### Code Change Documentation
+**Every user-facing change requires TheSuperHackers comment format:**
+```cpp
+// TheSuperHackers @keyword author DD/MM/YYYY Description
+```
+
+Common keywords: `@bugfix`, `@feature`, `@performance`, `@refactor`, `@tweak`, `@build`
+
+### Pull Request Guidelines
+- Title format: `type: Description starting with action verb`
+- Types: `bugfix:`, `feat:`, `fix:`, `refactor:`, `perf:`, `build:`
+- Zero Hour changes take precedence over Generals
+- Changes must be identical between both games when applicable
+
+### Code Style
+- Maintain consistency with surrounding legacy code
+- Prefer C++98 style unless modern features add significant value
+- No big refactors mixed with logical changes
+- Use present tense in documentation ("Fixes" not "Fixed")
+
+## Testing
+
+### Replay Compatibility Testing
+Located in `GeneralsReplays/` - critical for ensuring retail compatibility:
+```bash
+generalszh.exe -jobs 4 -headless -replay subfolder/*.rep
+```
+- Requires VC6 optimized build with RTS_BUILD_OPTION_DEBUG=OFF
+- Copies replays to `%USERPROFILE%/Documents/Command and Conquer Generals Zero Hour Data/Replays`
+- CI automatically tests GeneralsMD builds against known replays
+
+### Build Validation
+- CI tests multiple presets: vc6, vc6-profile, vc6-debug, win32 variants
+- Path-based change detection triggers relevant builds
+- Tools and extras are built with `+t+e` flags
+
+## Common Patterns
+
+### Memory Management
+- Manual memory management (delete/delete[]) - this is legacy C++98 code
+- STLPort for VC6 compatibility (see `cmake/stlport.cmake`)
+
+### Game Engine Separation
+- **GameLogic**: Game state, rules, simulation
+- **GameClient**: Rendering, UI, platform-specific code
+- Clean separation maintained for potential future networking
+
+### Module Structure
+```
+Core/
+├── GameEngine/Include/Common/     # Shared interfaces
+├── GameEngine/Include/GameLogic/  # Game simulation
+├── GameEngine/Include/GameClient/ # Rendering/UI
+├── Libraries/Include/rts/         # RTS-specific utilities
+└── Libraries/Source/WWVegas/      # Graphics framework
+```
+
+## External Dependencies
+
+### Required for Building
+- **VC6 builds**: Requires MSVC 6.0 toolchain (automated in CI via itsmattkc/MSVC600)
+- **Modern builds**: Visual Studio 2022, Ninja generator
+- **vcpkg** (optional): zlib, ffmpeg for enhanced builds
+
+### Platform-Specific
+- **Windows**: DirectX 8, Miles Sound System, Bink Video
+- **Registry detection**: Automatic game install path detection from EA registry keys
+
+## Tools and Utilities
+
+### Development Scripts (`scripts/cpp/`)
+- `fixInludesCase.sh`: Fix include case sensitivity
+- `refactor_*.py`: Code refactoring utilities
+- `remove_trailing_whitespace.py`: Code cleanup
+
+### Build Tools
+- W3DView: 3D model viewer
+- TextureCompress: Asset optimization
+- MapCacheBuilder: Map preprocessing
+
+## Key Files to Understand
+- `CMakePresets.json`: All build configurations
+- `cmake/config-build.cmake`: Build options and feature flags
+- `Core/GameEngine/Include/`: Core engine interfaces
+- `**/Code/Main/WinMain.cpp`: Application entry points
+- `GeneralsReplays/`: Compatibility test data

.github/workflows/build-toolchain.yml

@@ -30,11 +30,24 @@ jobs:
   build:
     name: ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }}
     runs-on: windows-2022
-    timeout-minutes: 20
+    timeout-minutes: 30
+    env:
+      VCPKG_FILE_CACHE: ${{ github.workspace }}\vcpkg-bincache
+      VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}\vcpkg-bincache,readwrite
+      VCPKG_FEATURE_FLAGS: manifests,versions,binarycaching
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
 
+      - name: Cache vcpkg binary artifacts
+        uses: actions/cache@v4
+        with:
+          path: ${{ github.workspace }}\vcpkg-bincache
+          key: vcpkg-bincache-${{ runner.os }}-${{ hashFiles('vcpkg.json','vcpkg-lock.json') }}-${{ inputs.preset }}
+          restore-keys: |
+            vcpkg-bincache-${{ runner.os }}-${{ hashFiles('vcpkg.json','vcpkg-lock.json') }}-
+            vcpkg-bincache-${{ runner.os }}-
+
       - name: Cache VC6 Installation
         if: startsWith(inputs.preset, 'vc6')
         id: cache-vc6

.github/workflows/check-replays.yml

@@ -1,4 +1,4 @@
-name: check-replays
+name: Check Replays
 
 permissions:
   contents: read
@@ -23,7 +23,7 @@ on:
 jobs:
   build:
     name: ${{ inputs.preset }}
-    runs-on: windows-latest
+    runs-on: windows-2022
     timeout-minutes: 15
     env:
       GAME_PATH: C:\GameData

.github/workflows/ci.yml

@@ -80,16 +80,15 @@ jobs:
           - preset: "win32-debug"
             tools: true
             extras: true
-          # vcpkg builds have been disabled for now due to excessive build times of 30 minutes per preset
-          # - preset: "win32-vcpkg"
-          #   tools: true
-          #   extras: true
-          # - preset: "win32-vcpkg-profile"
-          #   tools: true
-          #   extras: true
-          # - preset: "win32-vcpkg-debug"
-          #   tools: true
-          #   extras: true
+          - preset: "win32-vcpkg"
+            tools: true
+            extras: true
+          - preset: "win32-vcpkg-profile"
+            tools: true
+            extras: true
+          - preset: "win32-vcpkg-debug"
+            tools: true
+            extras: true
       fail-fast: false
     uses: ./.github/workflows/build-toolchain.yml
     with:
@@ -145,16 +144,15 @@ jobs:
           - preset: "win32-debug"
             tools: true
             extras: true
-          # vcpkg builds have been disabled for now due to excessive build times of 30 minutes per preset
-          # - preset: "win32-vcpkg"
-          #   tools: true
-          #   extras: true
-          # - preset: "win32-vcpkg-profile"
-          #   tools: true
-          #   extras: true
-          # - preset: "win32-vcpkg-debug"
-          #   tools: true
-          #   extras: true
+          - preset: "win32-vcpkg"
+            tools: true
+            extras: true
+          - preset: "win32-vcpkg-profile"
+            tools: true
+            extras: true
+          - preset: "win32-vcpkg-debug"
+            tools: true
+            extras: true
       fail-fast: false
     uses: ./.github/workflows/build-toolchain.yml
     with: