Merge branch 'main' into vanilla_test

Author: Caball009

.editorconfig

@@ -0,0 +1,13 @@
+root=true
+
+[*]
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{*.h,*.cpp,*.inl}]
+indent_style = unset
+indent_size = 2
+
+[{CMakeLists.txt,*.cmake,*.py}]
+indent_style = spaces
+indent_size = 4

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -0,0 +1,53 @@
+name: Bug Report
+description: Report bugs or issues you've encountered while playing the game
+type: Bug
+labels: [ "Bug", "⚠️ Triage" ]
+
+body:
+- type: checkboxes
+  attributes:
+    label: Prerequisites
+    description: Please make sure you've completed the following steps before submitting an issue
+    options:
+      - label: I have searched for similar issues and confirmed this is not a duplicate
+        required: true
+
+- type: checkboxes
+  attributes:
+    label: Game Version
+    description: Which version(s) of the game does this bug appear in?
+    options:
+      - label: "Command & Conquer Generals"
+        required: false
+      - label: "Command & Conquer Generals: Zero Hour"
+        required: false
+      - label: "Other (please specify below)"
+        required: false
+
+- type: textarea
+  attributes:
+    label: Bug Description
+    description: |
+      What is the bug? What happened versus what you expected to happen?
+      Please provide a clear and detailed description.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Reproduction Steps
+    description: How can we reproduce this bug?
+    placeholder: |
+      1. Start a new game with [specific settings]
+      2. Build/Select [specific unit/building]
+      3. Perform [specific action]
+      4. Observe [the bug]
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Additional Context
+    description: Add any relevant screenshots, video recordings, or other files here
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,8 +1,9 @@
 blank_issues_enabled: true
 contact_links:
-- name: Ideas & Feature Requests
+- name: Feature Request
   url: https://github.com/TheSuperHackers/GeneralsGameCode/discussions/categories/ideas
-  about: Request an idea or feature request to be added to the game.
+  about: Share your ideas or request new features to enhance the game
+
 - name: Community Outpost Discord Server
   url: https://discord.gg/WzxQDZersE
-  about: For help with miscelleneous things, join our discord server!
+  about: For help with miscellaneous things, join our Discord community

.github/ISSUE_TEMPLATE/config.yml

@@ -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/copilot-instructions.md

@@ -28,8 +28,8 @@ on:
 
 jobs:
   build:
-    name: Preset ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }}
-    runs-on: windows-latest
+    name: ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }}
+    runs-on: windows-2022
     timeout-minutes: 20
     steps:
       - name: Checkout Code
@@ -41,41 +41,38 @@ jobs:
         uses: actions/cache@v4
         with:
           path: C:\VC6
-          key: vc6-permanent-cache-v1
+          key: vc6-permanent-cache-v2
 
       - name: Cache CMake Dependencies
         id: cache-cmake-deps
         uses: actions/cache@v4
         with:
           path: build\${{ inputs.preset }}\_deps
-          key: cmake-deps-${{ inputs.preset }}-${{ hashFiles('cmake/**/*.cmake', '**/CMakeLists.txt') }}
-          restore-keys: |
-            cmake-deps-${{ inputs.preset }}-
+          key: cmake-deps-${{ inputs.preset }}-${{ hashFiles('CMakePresets.json','cmake/**/*.cmake','**/CMakeLists.txt') }}
 
-      - name: Download VC6 Portable from Cloudflare R2
+      - name: Download VC6 Portable from itsmattkc repo
         if: ${{ startsWith(inputs.preset, 'vc6') && steps.cache-vc6.outputs.cache-hit != 'true' }}
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
-          AWS_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT_URL }}
-          EXPECTED_HASH: "118D0F1ACBBD70C3F8B081CA4DBAF955FE0C6C359A76636E930AA89FDC551091"
+          EXPECTED_HASH: "D0EE1F6DCEF7DB3AD703120D9FB4FAD49EBCA28F44372E40550348B1C00CA583"
+          COMMIT: "001c4bafdcf2ef4b474d693acccd35a91e848f40"
         shell: pwsh
         run: |
           Write-Host "Downloading VC6 Portable Installation" -ForegroundColor Cyan
-          aws s3 cp s3://github-ci/VS6_VisualStudio6.7z VS6_VisualStudio6.7z --endpoint-url $env:AWS_ENDPOINT_URL
+          Invoke-WebRequest -Uri https://github.com/itsmattkc/MSVC600/archive/$env:COMMIT.zip -OutFile VS6_VisualStudio6.zip
 
           Write-Host "Verifying File Integrity" -ForegroundColor Cyan
-          $fileHash = (Get-FileHash -Path VS6_VisualStudio6.7z -Algorithm SHA256).Hash
+          $fileHash = (Get-FileHash -Path VS6_VisualStudio6.zip -Algorithm SHA256).Hash
           Write-Host "Downloaded file SHA256: $fileHash"
           Write-Host "Expected file SHA256: $env:EXPECTED_HASH"
-          if ($hash -ne $env:EXPECTED_HASH) {
+          if ($fileHash -ne $env:EXPECTED_HASH) {
               Write-Error "Hash verification failed! File may be corrupted or tampered with."
               exit 1
           }
 
           Write-Host "Extracting Archive" -ForegroundColor Cyan
-          & 7z x VS6_VisualStudio6.7z -oC:\VC6
-          Remove-Item VS6_VisualStudio6.7z -Verbose
+          & Expand-Archive -Path VS6_VisualStudio6.zip -DestinationPath C:\VC6
+          Move-Item -Path C:\VC6\MSVC600-$env:COMMIT -Destination C:\VC6\VC6SP6
+          Remove-Item VS6_VisualStudio6.zip -Verbose
 
       - name: Set Up VC6 Environment
         if: startsWith(inputs.preset, 'vc6')
@@ -102,19 +99,24 @@ jobs:
         with:
           arch: x86
 
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11
+
       - name: Configure ${{ inputs.game }} with CMake Using ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Preset
         shell: pwsh
         run: |
           $buildFlags = @(
-          "-DGENZH_BUILD_ZEROHOUR=${{ inputs.game == 'GeneralsMD' && 'ON' || 'OFF' }}",
-          "-DGENZH_BUILD_GENERALS=${{ inputs.game == 'Generals' && 'ON' || 'OFF' }}"
+          "-DRTS_BUILD_ZEROHOUR=${{ inputs.game == 'GeneralsMD' && 'ON' || 'OFF' }}",
+          "-DRTS_BUILD_GENERALS=${{ inputs.game == 'Generals' && 'ON' || 'OFF' }}"
           )
 
           $gamePrefix = "${{ inputs.game == 'Generals' && 'GENERALS' || 'ZEROHOUR' }}"
-          $buildFlags += "-DGENZH_BUILD_${gamePrefix}_TOOLS=${{ inputs.tools && 'ON' || 'OFF' }}"
-          $buildFlags += "-DGENZH_BUILD_${gamePrefix}_EXTRAS=${{ inputs.extras && 'ON' || 'OFF' }}"
+          $buildFlags += "-DRTS_BUILD_CORE_TOOLS=${{ inputs.tools && 'ON' || 'OFF' }}"
+          $buildFlags += "-DRTS_BUILD_${gamePrefix}_TOOLS=${{ inputs.tools && 'ON' || 'OFF' }}"
+          $buildFlags += "-DRTS_BUILD_CORE_EXTRAS=${{ inputs.extras && 'ON' || 'OFF' }}"
+          $buildFlags += "-DRTS_BUILD_${gamePrefix}_EXTRAS=${{ inputs.extras && 'ON' || 'OFF' }}"
 
-          Write-Host "Build flags: $buildFlags"
+          Write-Host "Build flags: $($buildFlags -join ' | ')"
 
           cmake --preset ${{ inputs.preset }} $buildFlags
 
@@ -131,12 +133,12 @@ jobs:
 
             if ("${{ inputs.preset }}" -like "win32*") {
             # For win32 preset, look in config-specific subdirectories
-            $configToUse = if ("${{ inputs.preset }}" -eq "win32dbg") { "Debug" } else { "Release" }
-            $files = Get-ChildItem -Path "$buildDir\${{ inputs.game }}\$configToUse" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
+            $configToUse = if ("${{ inputs.preset }}" -match "debug") { "Debug" } else { "Release" }
+            $files = Get-ChildItem -Path "$buildDir\Core\$configToUse","$buildDir\${{ inputs.game }}\$configToUse" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
             } else {
-            $files = Get-ChildItem -Path "$buildDir\${{ inputs.game }}" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
+            $files = Get-ChildItem -Path "$buildDir\Core","$buildDir\${{ inputs.game }}" -File | Where-Object { $_.Extension -in @(".exe", ".dll", ".pdb") } -Verbose
           }
-          $files | Move-Item -Destination $artifactsDir -Verbose
+          $files | Move-Item -Destination $artifactsDir -Verbose -Force
 
       - name: Upload ${{ inputs.game }} ${{ inputs.preset }}${{ inputs.tools && '+t' || '' }}${{ inputs.extras && '+e' || '' }} Artifact
         uses: actions/upload-artifact@v4